[Xfce4-commits] <xfconf:master> Drop usage of the G_CONST_RETURN macro.

[Nick Schermer]

Updating branch refs/heads/master
         to bcd41773c92cae1e77ad851b1684663c9a05ae76 (commit)
       from 69c9c1027f38c8c9353cc54912f009482487201f (commit)

commit bcd41773c92cae1e77ad851b1684663c9a05ae76
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jun 13 20:44:54 2011 +0200

    Drop usage of the G_CONST_RETURN macro.

 common/xfconf-gvaluefuncs.c |    2 +-
 common/xfconf-gvaluefuncs.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xfconf-gvaluefuncs.c b/common/xfconf-gvaluefuncs.c
index 8f8ff47..1527cb8 100644
--- a/common/xfconf-gvaluefuncs.c
+++ b/common/xfconf-gvaluefuncs.c
@@ -100,7 +100,7 @@ _xfconf_gtype_from_string(const gchar *type)
     return G_TYPE_INVALID;
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 _xfconf_string_from_gtype(GType gtype)
 {
     switch(gtype) {
diff --git a/common/xfconf-gvaluefuncs.h b/common/xfconf-gvaluefuncs.h
index 602dd62..d891516 100644
--- a/common/xfconf-gvaluefuncs.h
+++ b/common/xfconf-gvaluefuncs.h
@@ -26,7 +26,7 @@
 G_BEGIN_DECLS
 
 G_GNUC_INTERNAL GType _xfconf_gtype_from_string(const gchar *type);
-G_GNUC_INTERNAL G_CONST_RETURN gchar *_xfconf_string_from_gtype(GType gtype);
+G_GNUC_INTERNAL const gchar *_xfconf_string_from_gtype(GType gtype);
 
 G_GNUC_INTERNAL gboolean _xfconf_gvalue_from_string(GValue *value,
                                                     const gchar *str);