summaryrefslogtreecommitdiff
path: root/xfce4-session
diff options
context:
space:
mode:
authorNick Schermer <nick@xfce.org>2011-06-13 20:47:21 +0200
committerNick Schermer <nick@xfce.org>2011-06-13 20:47:21 +0200
commit6f7262c8c59b4358d74cf0d98edcf8bab5672f80 (patch)
treee07245516ec7af553d1198264a47d7c8b3ea0966 /xfce4-session
parentbb5d329ce6da5aeb89f165744e4a408acf94f754 (diff)
downloadxfce4-session-6f7262c8c59b4358d74cf0d98edcf8bab5672f80.tar.gz
Drop usage of G_CONST_RETURN macro.
Diffstat (limited to 'xfce4-session')
-rw-r--r--xfce4-session/xfsm-client.c4
-rw-r--r--xfce4-session/xfsm-client.h4
-rw-r--r--xfce4-session/xfsm-properties.c2
-rw-r--r--xfce4-session/xfsm-properties.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/xfce4-session/xfsm-client.c b/xfce4-session/xfsm-client.c
index 400bb5b1..9f879d68 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 110de880..50aa541d 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 d75dec67..e9c943c8 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 815dc399..6fe00e72 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);