diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c index b40a86c..e8edc94 100644 --- a/unique/uniqueapp.c +++ b/unique/uniqueapp.c @@ -781,7 +781,7 @@ unique_app_watch_window (UniqueApp *app, } -G_CONST_RETURN gchar * +const gchar * unique_command_to_string (UniqueApp *app, gint command) { @@ -863,7 +863,7 @@ unique_command_from_string (UniqueApp *app, return retval; } -G_CONST_RETURN gchar * +const gchar * unique_response_to_string (UniqueResponse response) { GEnumClass *enum_class; diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c index 18a0c45..6a9500a 100644 --- a/unique/uniquebackend.c +++ b/unique/uniquebackend.c @@ -111,7 +111,7 @@ unique_backend_set_name (UniqueBackend *backend, * * Return value: FIXME */ -G_CONST_RETURN gchar * +const gchar * unique_backend_get_name (UniqueBackend *backend) { g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); @@ -154,7 +154,7 @@ unique_backend_set_startup_id (UniqueBackend *backend, * * Return value: FIXME */ -G_CONST_RETURN gchar * +const gchar * unique_backend_get_startup_id (UniqueBackend *backend) { g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); diff --git a/unique/uniquebackend.h b/unique/uniquebackend.h index a50ce4e..a8786bf 100644 --- a/unique/uniquebackend.h +++ b/unique/uniquebackend.h @@ -94,10 +94,10 @@ GType unique_backend_get_type (void) G_GNUC_CONST; UniqueBackend * unique_backend_create (void); -G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); +const gchar *unique_backend_get_name (UniqueBackend *backend); void unique_backend_set_name (UniqueBackend *backend, const gchar *name); -G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); +const gchar *unique_backend_get_startup_id (UniqueBackend *backend); void unique_backend_set_startup_id (UniqueBackend *backend, const gchar *startup_id); GdkScreen * unique_backend_get_screen (UniqueBackend *backend); diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h index ace40ed..f688939 100644 --- a/unique/uniqueinternals.h +++ b/unique/uniqueinternals.h @@ -44,11 +44,11 @@ UniqueResponse unique_app_emit_message_received (UniqueApp *app, * and then back into an id */ UniqueResponse unique_response_from_string (const gchar *response); -G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); +const gchar *unique_response_to_string (UniqueResponse response); gint unique_command_from_string (UniqueApp *app, const gchar *command); -G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, +const gchar *unique_command_to_string (UniqueApp *app, gint command); G_END_DECLS diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c index 10f6df5..b13be7f 100644 --- a/unique/uniquemessage.c +++ b/unique/uniquemessage.c @@ -185,7 +185,7 @@ unique_message_data_set (UniqueMessageData *message_data, * * Since: 1.0.2 */ -G_CONST_RETURN guchar * +const guchar * unique_message_data_get (UniqueMessageData *message_data, gsize *length) { @@ -525,7 +525,7 @@ unique_message_data_get_screen (UniqueMessageData *message_data) * owned by the #UniqueMessageData structure and should not be * modified or freed */ -G_CONST_RETURN gchar * +const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data) { g_return_val_if_fail (message_data != NULL, NULL); diff --git a/unique/uniquemessage.h b/unique/uniquemessage.h index d3e9c3c..9759a30 100644 --- a/unique/uniquemessage.h +++ b/unique/uniquemessage.h @@ -48,7 +48,7 @@ void unique_message_data_free (UniqueMessageData *me void unique_message_data_set (UniqueMessageData *message_data, const guchar *data, gsize length); -G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, +const guchar *unique_message_data_get (UniqueMessageData *message_data, gsize *length); gboolean unique_message_data_set_text (UniqueMessageData *message_data, @@ -63,7 +63,7 @@ void unique_message_data_set_filename (UniqueMessageData *me gchar * unique_message_data_get_filename (UniqueMessageData *message_data); GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); -G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); +const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); guint unique_message_data_get_workspace (UniqueMessageData *message_data); G_END_DECLS