[gnome-panel] panel: Stop using G_CONST_RETURN

[Vincent Untz <vuntz src gnome org>]

commit 844c6bf5cf444abfda93fd0fcdbfb48b9fe3c4cb
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Jun 27 22:25:36 2011 +0200

    panel: Stop using G_CONST_RETURN

 gnome-panel/applet.c              |    2 +-
 gnome-panel/panel-action-button.c |    8 ++++----
 gnome-panel/panel-action-button.h |    8 ++++----
 gnome-panel/panel-ditem-editor.c  |    2 +-
 gnome-panel/panel-ditem-editor.h  |    2 +-
 gnome-panel/panel-menu-button.c   |    2 +-
 gnome-panel/panel-toplevel.c      |    6 +++---
 gnome-panel/panel-toplevel.h      |    6 +++---
 8 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index 38338b7..a5f3b8a 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -792,7 +792,7 @@ panel_applet_destroy (GtkWidget  *widget,
 	g_free (info);
 }
 
-static G_CONST_RETURN char *
+static const char *
 panel_applet_get_toplevel_id (AppletInfo *applet)
 {
 	PanelWidget *panel_widget;
diff --git a/gnome-panel/panel-action-button.c b/gnome-panel/panel-action-button.c
index abc5843..104696f 100644
--- a/gnome-panel/panel-action-button.c
+++ b/gnome-panel/panel-action-button.c
@@ -387,7 +387,7 @@ panel_action_get_invoke (PanelActionButtonType type)
 	return G_CALLBACK (actions[type].invoke);
 }
 
-G_CONST_RETURN char*
+const char*
 panel_action_get_icon_name (PanelActionButtonType type)
 {
 	g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL);
@@ -395,7 +395,7 @@ panel_action_get_icon_name (PanelActionButtonType type)
 	return actions[type].icon_name;
 }
 
-G_CONST_RETURN char*
+const char*
 panel_action_get_text (PanelActionButtonType type)
 {
 	g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL);
@@ -403,7 +403,7 @@ panel_action_get_text (PanelActionButtonType type)
 	return _(actions[type].text);
 }
 
-G_CONST_RETURN char*
+const char*
 panel_action_get_tooltip (PanelActionButtonType type)
 {
 	g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL);
@@ -411,7 +411,7 @@ panel_action_get_tooltip (PanelActionButtonType type)
 	return _(actions[type].tooltip);
 }
 
-G_CONST_RETURN char*
+const char*
 panel_action_get_drag_id (PanelActionButtonType type)
 {
 	g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL);
diff --git a/gnome-panel/panel-action-button.h b/gnome-panel/panel-action-button.h
index 31f4087..a6bbe2e 100644
--- a/gnome-panel/panel-action-button.h
+++ b/gnome-panel/panel-action-button.h
@@ -83,10 +83,10 @@ gboolean   panel_action_button_load_from_drag   (PanelToplevel          *topleve
 
 gboolean             panel_action_get_is_disabled (PanelActionButtonType type);
 GCallback            panel_action_get_invoke      (PanelActionButtonType type);
-G_CONST_RETURN char *panel_action_get_icon_name   (PanelActionButtonType type);
-G_CONST_RETURN char *panel_action_get_text        (PanelActionButtonType type);
-G_CONST_RETURN char *panel_action_get_tooltip     (PanelActionButtonType type);
-G_CONST_RETURN char *panel_action_get_drag_id     (PanelActionButtonType type);
+const char          *panel_action_get_icon_name   (PanelActionButtonType type);
+const char          *panel_action_get_text        (PanelActionButtonType type);
+const char          *panel_action_get_tooltip     (PanelActionButtonType type);
+const char          *panel_action_get_drag_id     (PanelActionButtonType type);
 
 G_END_DECLS
 
diff --git a/gnome-panel/panel-ditem-editor.c b/gnome-panel/panel-ditem-editor.c
index da68a24..c55b290 100644
--- a/gnome-panel/panel-ditem-editor.c
+++ b/gnome-panel/panel-ditem-editor.c
@@ -1773,7 +1773,7 @@ panel_ditem_editor_get_revert_key_file (PanelDItemEditor *dialog)
 	return dialog->priv->revert_key_file;
 }
 
-G_CONST_RETURN char *
+const char *
 panel_ditem_editor_get_uri (PanelDItemEditor *dialog)
 {
 	g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL);
diff --git a/gnome-panel/panel-ditem-editor.h b/gnome-panel/panel-ditem-editor.h
index 1882ad7..c16745a 100644
--- a/gnome-panel/panel-ditem-editor.h
+++ b/gnome-panel/panel-ditem-editor.h
@@ -100,7 +100,7 @@ GKeyFile *panel_ditem_editor_get_revert_key_file (PanelDItemEditor *dialog);
 void panel_ditem_editor_set_uri (PanelDItemEditor *dialog,
 				 const char       *uri);
 
-G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
+const char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
 
 void panel_ditem_register_save_uri_func (PanelDItemEditor  *dialog,
 					 PanelDitemSaveUri  save_uri,
diff --git a/gnome-panel/panel-menu-button.c b/gnome-panel/panel-menu-button.c
index 61cb5b5..77e8121 100644
--- a/gnome-panel/panel-menu-button.c
+++ b/gnome-panel/panel-menu-button.c
@@ -938,7 +938,7 @@ panel_menu_button_accessible_ref_child (AtkObject *obj,
 	return g_object_ref (gtk_widget_get_accessible (menu));
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 panel_menu_button_accessible_get_name (AtkObject *obj)
 {
 	const char *name;
diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
index 2ae7589..5f53b6a 100644
--- a/gnome-panel/panel-toplevel.c
+++ b/gnome-panel/panel-toplevel.c
@@ -4593,7 +4593,7 @@ panel_toplevel_set_toplevel_id (PanelToplevel *toplevel,
 	toplevel->priv->toplevel_id = g_strdup (toplevel_id);
 }
 
-G_CONST_RETURN char *
+const char *
 panel_toplevel_get_id (PanelToplevel *toplevel)
 {
 	g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), NULL);
@@ -4668,7 +4668,7 @@ panel_toplevel_set_name (PanelToplevel *toplevel,
 	g_object_notify (G_OBJECT (toplevel), "name");
 }
 
-G_CONST_RETURN char *
+const char *
 panel_toplevel_get_name (PanelToplevel *toplevel)
 {
 	g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), NULL);
@@ -4676,7 +4676,7 @@ panel_toplevel_get_name (PanelToplevel *toplevel)
 	return toplevel->priv->name;
 }
 
-G_CONST_RETURN char *
+const char *
 panel_toplevel_get_description (PanelToplevel *toplevel)
 {
 	g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), NULL);
diff --git a/gnome-panel/panel-toplevel.h b/gnome-panel/panel-toplevel.h
index c8fd299..ea5c70e 100644
--- a/gnome-panel/panel-toplevel.h
+++ b/gnome-panel/panel-toplevel.h
@@ -76,11 +76,11 @@ GType                panel_toplevel_get_type               (void) G_GNUC_CONST;
 
 PanelWidget         *panel_toplevel_get_panel_widget       (PanelToplevel       *toplevel);
 
-G_CONST_RETURN char *panel_toplevel_get_id                 (PanelToplevel       *toplevel);
+const char          *panel_toplevel_get_id                 (PanelToplevel       *toplevel);
 void                 panel_toplevel_set_name               (PanelToplevel       *toplevel,	
 							    const char          *name);
-G_CONST_RETURN char *panel_toplevel_get_name               (PanelToplevel       *toplevel);
-G_CONST_RETURN char *panel_toplevel_get_description        (PanelToplevel       *toplevel);
+const char          *panel_toplevel_get_name               (PanelToplevel       *toplevel);
+const char          *panel_toplevel_get_description        (PanelToplevel       *toplevel);
 void                 panel_toplevel_set_expand             (PanelToplevel       *toplevel,
 							    gboolean             expand);
 gboolean             panel_toplevel_get_expand             (PanelToplevel       *toplevel);