[vino] Use const instead deprecated G_CONST_RETURN



commit 642b4100a804dc3fc463b745e7c017529db45d05
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 13 17:15:38 2011 +0100

    Use const instead deprecated G_CONST_RETURN

 server/vino-server.c |    6 +++---
 server/vino-server.h |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/server/vino-server.c b/server/vino-server.c
index 0a5ff97..7ae4c7c 100644
--- a/server/vino-server.c
+++ b/server/vino-server.c
@@ -1544,7 +1544,7 @@ vino_server_set_display_status_icon (VinoServer *server,
   server->priv->display_status_icon = display_status_icon;
 }
 
-G_CONST_RETURN char *
+const char *
 vino_server_get_network_interface (VinoServer *server)
 {
   g_return_val_if_fail (VINO_IS_SERVER (server), NULL);
@@ -1805,7 +1805,7 @@ vino_server_set_vnc_password (VinoServer *server,
   g_object_notify (G_OBJECT (server), "vnc-password");
 }
 
-G_CONST_RETURN char *
+const char *
 vino_server_get_vnc_password (VinoServer *server)
 {
   g_return_val_if_fail (VINO_IS_SERVER (server), NULL);
@@ -1813,7 +1813,7 @@ vino_server_get_vnc_password (VinoServer *server)
   return server->priv->vnc_password;
 }
 
-G_CONST_RETURN char *
+const char *
 vino_client_get_hostname (VinoClient *client)
 {
   return client->rfb_client->host;
diff --git a/server/vino-server.h b/server/vino-server.h
index 21835e3..2037bce 100644
--- a/server/vino-server.h
+++ b/server/vino-server.h
@@ -95,7 +95,7 @@ guint16              vino_server_get_external_port        (VinoServer     *serve
 
 void                 vino_server_set_network_interface    (VinoServer     *server,
                                                            const char     *network_interface);
-G_CONST_RETURN char *vino_server_get_network_interface    (VinoServer     *server);
+const char          *vino_server_get_network_interface    (VinoServer     *server);
 void                 vino_server_set_require_encryption   (VinoServer     *server,
 							   gboolean        require_encryption);
 gboolean             vino_server_get_require_encryption   (VinoServer     *server);
@@ -104,7 +104,7 @@ void                 vino_server_set_auth_methods         (VinoServer     *serve
 VinoAuthMethod       vino_server_get_auth_methods         (VinoServer     *server);
 void                 vino_server_set_vnc_password         (VinoServer     *server,
 							   const char     *vnc_password);
-G_CONST_RETURN char *vino_server_get_vnc_password         (VinoServer     *server);
+const char          *vino_server_get_vnc_password         (VinoServer     *server);
 void                 vino_server_set_lock_screen          (VinoServer     *server,
 							   gboolean        lock_screen);
 gboolean             vino_server_get_lock_screen          (VinoServer     *server);
@@ -124,7 +124,7 @@ gboolean             vino_server_get_disable_xdamage      (VinoServer     *serve
 #include "vino-status-icon.h"
 VinoStatusIcon      *vino_server_get_status_icon          (VinoServer      *server);
 
-G_CONST_RETURN char *vino_client_get_hostname (VinoClient *client);
+const char          *vino_client_get_hostname (VinoClient *client);
 void                 vino_client_disconnect   (VinoClient *client);
 
 G_END_DECLS



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]