| G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid |
| build failures. |
| |
| RP 2011/10/12 |
| |
| Upstream-Status: Pending |
| |
| Index: libunique-1.1.6/unique/uniqueapp.c |
| =================================================================== |
| --- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100 |
| +++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100 |
| @@ -781,7 +781,7 @@ |
| } |
| |
| |
| -G_CONST_RETURN gchar * |
| +const gchar * |
| unique_command_to_string (UniqueApp *app, |
| gint command) |
| { |
| @@ -863,7 +863,7 @@ |
| return retval; |
| } |
| |
| -G_CONST_RETURN gchar * |
| +const gchar * |
| unique_response_to_string (UniqueResponse response) |
| { |
| GEnumClass *enum_class; |
| Index: libunique-1.1.6/unique/uniquebackend.c |
| =================================================================== |
| --- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100 |
| +++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100 |
| @@ -111,7 +111,7 @@ |
| * |
| * 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 @@ |
| * |
| * 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); |
| Index: libunique-1.1.6/unique/uniquebackend.h |
| =================================================================== |
| --- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100 |
| +++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100 |
| @@ -94,10 +94,10 @@ |
| |
| 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); |
| Index: libunique-1.1.6/unique/uniqueinternals.h |
| =================================================================== |
| --- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100 |
| +++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100 |
| @@ -44,11 +44,11 @@ |
| * 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 |
| Index: libunique-1.1.6/unique/uniquemessage.c |
| =================================================================== |
| --- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100 |
| +++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100 |
| @@ -185,7 +185,7 @@ |
| * |
| * Since: 1.0.2 |
| */ |
| -G_CONST_RETURN guchar * |
| +const guchar * |
| unique_message_data_get (UniqueMessageData *message_data, |
| gsize *length) |
| { |
| @@ -525,7 +525,7 @@ |
| * 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); |
| Index: libunique-1.1.6/unique/uniquemessage.h |
| =================================================================== |
| --- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100 |
| +++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100 |
| @@ -48,7 +48,7 @@ |
| 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 @@ |
| 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 |