[Xfce4-commits] <xfce4-session:master> Drop usage of G_CONST_RETURN macro.

[Nick Schermer]

Updating branch refs/heads/master
         to 6f7262c8c59b4358d74cf0d98edcf8bab5672f80 (commit)
       from bb5d329ce6da5aeb89f165744e4a408acf94f754 (commit)

commit 6f7262c8c59b4358d74cf0d98edcf8bab5672f80
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jun 13 20:47:21 2011 +0200

    Drop usage of G_CONST_RETURN macro.

 xfce4-session/xfsm-client.c     |    4 ++--
 xfce4-session/xfsm-client.h     |    4 ++--
 xfce4-session/xfsm-properties.c |    2 +-
 xfce4-session/xfsm-properties.h |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xfce4-session/xfsm-client.c b/xfce4-session/xfsm-client.c
index 400bb5b..9f879d6 100644
--- a/xfce4-session/xfsm-client.c
+++ b/xfce4-session/xfsm-client.c
@@ -278,7 +278,7 @@ xfsm_client_set_state (XfsmClient     *client,
 }
 
 
-G_CONST_RETURN gchar *
+const gchar *
 xfsm_client_get_id (XfsmClient *client)
 {
   g_return_val_if_fail (XFSM_IS_CLIENT (client), NULL);
@@ -380,7 +380,7 @@ xfsm_client_delete_properties (XfsmClient *client,
 }
 
 
-G_CONST_RETURN gchar *
+const gchar *
 xfsm_client_get_object_path (XfsmClient *client)
 {
   g_return_val_if_fail (XFSM_IS_CLIENT (client), NULL);
diff --git a/xfce4-session/xfsm-client.h b/xfce4-session/xfsm-client.h
index 110de88..50aa541 100644
--- a/xfce4-session/xfsm-client.h
+++ b/xfce4-session/xfsm-client.h
@@ -61,7 +61,7 @@ XfsmClientState xfsm_client_get_state (XfsmClient *client);
 void xfsm_client_set_state (XfsmClient     *client,
                             XfsmClientState state);
 
-G_CONST_RETURN gchar *xfsm_client_get_id (XfsmClient *client);
+const gchar *xfsm_client_get_id (XfsmClient *client);
 
 SmsConn xfsm_client_get_sms_connection (XfsmClient *client);
 
@@ -75,7 +75,7 @@ void xfsm_client_delete_properties (XfsmClient *client,
                                     gchar     **prop_names,
                                     gint        num_props);
 
-G_CONST_RETURN gchar *xfsm_client_get_object_path (XfsmClient *client);
+const gchar *xfsm_client_get_object_path (XfsmClient *client);
 
 G_END_DECLS
 
diff --git a/xfce4-session/xfsm-properties.c b/xfce4-session/xfsm-properties.c
index d75dec6..e9c943c 100644
--- a/xfce4-session/xfsm-properties.c
+++ b/xfce4-session/xfsm-properties.c
@@ -409,7 +409,7 @@ xfsm_properties_check (const XfsmProperties *properties)
 }
 
 
-G_CONST_RETURN gchar *
+const gchar *
 xfsm_properties_get_string (XfsmProperties *properties,
                             const gchar *property_name)
 {
diff --git a/xfce4-session/xfsm-properties.h b/xfce4-session/xfsm-properties.h
index 815dc39..6fe00e7 100644
--- a/xfce4-session/xfsm-properties.h
+++ b/xfce4-session/xfsm-properties.h
@@ -69,7 +69,7 @@ XfsmProperties* xfsm_properties_load (XfceRc *rc, const gchar *prefix);
 
 gboolean xfsm_properties_check (const XfsmProperties *properties) G_GNUC_CONST;
 
-G_CONST_RETURN gchar *xfsm_properties_get_string (XfsmProperties *properties,
+const gchar *xfsm_properties_get_string (XfsmProperties *properties,
                                                   const gchar *property_name);
 gchar **xfsm_properties_get_strv (XfsmProperties *properties,
                                   const gchar *property_name);