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

[Nick Schermer]

Updating branch refs/heads/master
         to 71d7195ab203b3efbb9fae127ce15e41ea6c9c65 (commit)
       from 1b78f177b7b604b8fb846fab600bff712d7f5578 (commit)

commit 71d7195ab203b3efbb9fae127ce15e41ea6c9c65
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jun 13 20:41:43 2011 +0200

    Drop G_CONST_RETURN macro.

 libxfce4ui/xfce-sm-client.c     |    8 ++++----
 libxfce4ui/xfce-sm-client.h     |    8 ++++----
 libxfce4ui/xfce-titled-dialog.c |    2 +-
 libxfce4ui/xfce-titled-dialog.h |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 6307650..c757246 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -2139,7 +2139,7 @@ xfce_sm_client_get_priority(XfceSMClient *sm_client)
  *
  * Returns: an opaque object-owned string
  **/
-G_CONST_RETURN gchar *
+const gchar *
 xfce_sm_client_get_client_id(XfceSMClient *sm_client)
 {
     g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL);
@@ -2172,7 +2172,7 @@ xfce_sm_client_get_client_id(XfceSMClient *sm_client)
  * Returns: a file name string, owned by the object or %NULL if
  *          the session client is disabled.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 xfce_sm_client_get_state_file(XfceSMClient *sm_client)
 {
     gchar *resource, *p;
@@ -2234,7 +2234,7 @@ xfce_sm_client_get_state_file(XfceSMClient *sm_client)
  *
  * Returns: an object-owned string
  **/
-G_CONST_RETURN gchar *
+const gchar *
 xfce_sm_client_get_current_directory(XfceSMClient *sm_client)
 {
     g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL);
@@ -2250,7 +2250,7 @@ xfce_sm_client_get_current_directory(XfceSMClient *sm_client)
  *
  * Returns: an object-owned string vector
  **/
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 xfce_sm_client_get_restart_command(XfceSMClient *sm_client)
 {
     g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL);
diff --git a/libxfce4ui/xfce-sm-client.h b/libxfce4ui/xfce-sm-client.h
index 7a7a19f..cbc8a98 100644
--- a/libxfce4ui/xfce-sm-client.h
+++ b/libxfce4ui/xfce-sm-client.h
@@ -94,9 +94,9 @@ gboolean xfce_sm_client_is_resumed(XfceSMClient *sm_client);
 void xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
                                      const gchar *desktop_file);
 
-G_CONST_RETURN gchar *xfce_sm_client_get_client_id(XfceSMClient *sm_client);
+const gchar *xfce_sm_client_get_client_id(XfceSMClient *sm_client);
 
-G_CONST_RETURN gchar *xfce_sm_client_get_state_file(XfceSMClient *sm_client);
+const gchar *xfce_sm_client_get_state_file(XfceSMClient *sm_client);
 
 void xfce_sm_client_set_restart_style(XfceSMClient *sm_client,
                                       XfceSMClientRestartStyle restart_style);
@@ -108,11 +108,11 @@ guint8 xfce_sm_client_get_priority(XfceSMClient *sm_client);
 
 void xfce_sm_client_set_current_directory(XfceSMClient *sm_client,
                                           const gchar *current_directory);
-G_CONST_RETURN gchar *xfce_sm_client_get_current_directory(XfceSMClient *sm_client);
+const gchar *xfce_sm_client_get_current_directory(XfceSMClient *sm_client);
 
 void xfce_sm_client_set_restart_command(XfceSMClient *sm_client,
                                         gchar **restart_command);
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 xfce_sm_client_get_restart_command(XfceSMClient *sm_client);
 
 G_END_DECLS
diff --git a/libxfce4ui/xfce-titled-dialog.c b/libxfce4ui/xfce-titled-dialog.c
index 1177618..5c8939d 100644
--- a/libxfce4ui/xfce-titled-dialog.c
+++ b/libxfce4ui/xfce-titled-dialog.c
@@ -316,7 +316,7 @@ xfce_titled_dialog_new_with_buttons (const gchar    *title,
  *
  * Return value: the subtitle of @titled_dialog, or %NULL.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog)
 {
   g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (titled_dialog), NULL);
diff --git a/libxfce4ui/xfce-titled-dialog.h b/libxfce4ui/xfce-titled-dialog.h
index 1dde53e..ddf4ec4 100644
--- a/libxfce4ui/xfce-titled-dialog.h
+++ b/libxfce4ui/xfce-titled-dialog.h
@@ -69,7 +69,7 @@ GtkWidget            *xfce_titled_dialog_new_with_buttons (const gchar      *tit
                                                            const gchar      *first_button_text,
                                                            ...) G_GNUC_MALLOC;
 
-G_CONST_RETURN gchar *xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
+const gchar          *xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
 void                  xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
                                                            const gchar      *subtitle);