[Xfce4-commits] <xfce4-panel:master> Drop G_CONST_RETURN macro.

[Nick Schermer]

Updating branch refs/heads/master
         to afb54ab8fdb5bfb6493e5be291eb2901773cc7fc (commit)
       from 81bba772780ae8c2faac733f81b23f4b9a381b22 (commit)

commit afb54ab8fdb5bfb6493e5be291eb2901773cc7fc
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jun 13 20:39:17 2011 +0200

    Drop G_CONST_RETURN macro.

 libxfce4panel/libxfce4panel-config.c       |    2 +-
 libxfce4panel/libxfce4panel-config.h.in    |    6 +++---
 libxfce4panel/xfce-panel-plugin-provider.c |    2 +-
 libxfce4panel/xfce-panel-plugin-provider.h |    2 +-
 libxfce4panel/xfce-panel-plugin.c          |   10 +++++-----
 libxfce4panel/xfce-panel-plugin.h          |   11 +++++------
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/libxfce4panel/libxfce4panel-config.c b/libxfce4panel/libxfce4panel-config.c
index 0a7caf9..5fe96c8 100644
--- a/libxfce4panel/libxfce4panel-config.c
+++ b/libxfce4panel/libxfce4panel-config.c
@@ -121,7 +121,7 @@ const guint libxfce4panel_micro_version = LIBXFCE4PANEL_MICRO_VERSION;
  *
  * Since: 4.8
  **/
-G_CONST_RETURN gchar *
+const gchar *
 libxfce4panel_check_version (guint required_major,
                              guint required_minor,
                              guint required_micro)
diff --git a/libxfce4panel/libxfce4panel-config.h.in b/libxfce4panel/libxfce4panel-config.h.in
index 9b55f03..6fc8684 100644
--- a/libxfce4panel/libxfce4panel-config.h.in
+++ b/libxfce4panel/libxfce4panel-config.h.in
@@ -97,9 +97,9 @@ extern const guint libxfce4panel_major_version;
 extern const guint libxfce4panel_minor_version;
 extern const guint libxfce4panel_micro_version;
 
-G_CONST_RETURN gchar *libxfce4panel_check_version (guint required_major,
-                                                   guint required_minor,
-                                                   guint required_micro);
+const gchar *libxfce4panel_check_version (guint required_major,
+                                          guint required_minor,
+                                          guint required_micro);
 
 G_END_DECLS
 
diff --git a/libxfce4panel/xfce-panel-plugin-provider.c b/libxfce4panel/xfce-panel-plugin-provider.c
index 967de02..d7b2ec3 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.c
+++ b/libxfce4panel/xfce-panel-plugin-provider.c
@@ -83,7 +83,7 @@ xfce_panel_plugin_provider_default_init (XfcePanelPluginProviderInterface *klass
 
 
 
-G_CONST_RETURN gchar *
+const gchar *
 xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider)
 {
   panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), NULL);
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h b/libxfce4panel/xfce-panel-plugin-provider.h
index f4e2a5c..bacf4c5 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -147,7 +147,7 @@ enum
 
 GType                 xfce_panel_plugin_provider_get_type            (void) G_GNUC_CONST;
 
-G_CONST_RETURN gchar *xfce_panel_plugin_provider_get_name            (XfcePanelPluginProvider       *provider);
+const gchar          *xfce_panel_plugin_provider_get_name            (XfcePanelPluginProvider       *provider);
 
 gint                  xfce_panel_plugin_provider_get_unique_id       (XfcePanelPluginProvider       *provider);
 
diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c
index ba45bf5..5b7abf9 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1473,7 +1473,7 @@ xfce_panel_plugin_menu_item_destroy (GtkWidget       *item,
  *
  * Returns: the name of the panel plugin.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
 {
   g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1493,7 +1493,7 @@ xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
  *
  * Returns: the (translated) display name of the plugin.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
 {
   g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1518,7 +1518,7 @@ xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
  *
  * Since: 4.8
  **/
-G_CONST_RETURN gchar *
+const gchar *
 xfce_panel_plugin_get_comment (XfcePanelPlugin *plugin)
 {
   g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1565,7 +1565,7 @@ xfce_panel_plugin_get_unique_id (XfcePanelPlugin *plugin)
  *           XFCE_PANEL_PLUGIN_CHANNEL_NAME and
  *           xfce_panel_get_channel_name
  **/
-G_CONST_RETURN gchar *
+const gchar *
 xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin)
 {
   g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1598,7 +1598,7 @@ xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin)
  *
  * Since: 4.8
  **/
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin)
 {
   g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
diff --git a/libxfce4panel/xfce-panel-plugin.h b/libxfce4panel/xfce-panel-plugin.h
index b905120..a6b8f75 100644
--- a/libxfce4panel/xfce-panel-plugin.h
+++ b/libxfce4panel/xfce-panel-plugin.h
@@ -154,18 +154,17 @@ struct _XfcePanelPlugin
 
 GType                 xfce_panel_plugin_get_type            (void) G_GNUC_CONST;
 
-G_CONST_RETURN gchar *xfce_panel_plugin_get_name            (XfcePanelPlugin   *plugin) G_GNUC_PURE;
+const gchar          *xfce_panel_plugin_get_name            (XfcePanelPlugin   *plugin) G_GNUC_PURE;
 
-G_CONST_RETURN gchar *xfce_panel_plugin_get_display_name    (XfcePanelPlugin   *plugin) G_GNUC_PURE;
+const gchar          *xfce_panel_plugin_get_display_name    (XfcePanelPlugin   *plugin) G_GNUC_PURE;
 
-G_CONST_RETURN gchar *xfce_panel_plugin_get_comment         (XfcePanelPlugin   *plugin) G_GNUC_PURE;
+const gchar          *xfce_panel_plugin_get_comment         (XfcePanelPlugin   *plugin) G_GNUC_PURE;
 
 gint                  xfce_panel_plugin_get_unique_id       (XfcePanelPlugin   *plugin) G_GNUC_PURE;
 
-G_CONST_RETURN gchar *xfce_panel_plugin_get_property_base   (XfcePanelPlugin   *plugin) G_GNUC_PURE;
+const gchar          *xfce_panel_plugin_get_property_base   (XfcePanelPlugin   *plugin) G_GNUC_PURE;
 
-G_CONST_RETURN gchar * G_CONST_RETURN *
-                      xfce_panel_plugin_get_arguments       (XfcePanelPlugin   *plugin) G_GNUC_PURE;
+const gchar * const  *xfce_panel_plugin_get_arguments       (XfcePanelPlugin   *plugin) G_GNUC_PURE;
 
 gint                  xfce_panel_plugin_get_size            (XfcePanelPlugin   *plugin) G_GNUC_PURE;