Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid |
| 2 | build failures. |
| 3 | |
| 4 | RP 2011/10/12 |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Index: libunique-1.1.6/unique/uniqueapp.c |
| 9 | =================================================================== |
| 10 | --- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100 |
| 11 | +++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100 |
| 12 | @@ -781,7 +781,7 @@ |
| 13 | } |
| 14 | |
| 15 | |
| 16 | -G_CONST_RETURN gchar * |
| 17 | +const gchar * |
| 18 | unique_command_to_string (UniqueApp *app, |
| 19 | gint command) |
| 20 | { |
| 21 | @@ -863,7 +863,7 @@ |
| 22 | return retval; |
| 23 | } |
| 24 | |
| 25 | -G_CONST_RETURN gchar * |
| 26 | +const gchar * |
| 27 | unique_response_to_string (UniqueResponse response) |
| 28 | { |
| 29 | GEnumClass *enum_class; |
| 30 | Index: libunique-1.1.6/unique/uniquebackend.c |
| 31 | =================================================================== |
| 32 | --- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100 |
| 33 | +++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100 |
| 34 | @@ -111,7 +111,7 @@ |
| 35 | * |
| 36 | * Return value: FIXME |
| 37 | */ |
| 38 | -G_CONST_RETURN gchar * |
| 39 | +const gchar * |
| 40 | unique_backend_get_name (UniqueBackend *backend) |
| 41 | { |
| 42 | g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); |
| 43 | @@ -154,7 +154,7 @@ |
| 44 | * |
| 45 | * Return value: FIXME |
| 46 | */ |
| 47 | -G_CONST_RETURN gchar * |
| 48 | +const gchar * |
| 49 | unique_backend_get_startup_id (UniqueBackend *backend) |
| 50 | { |
| 51 | g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); |
| 52 | Index: libunique-1.1.6/unique/uniquebackend.h |
| 53 | =================================================================== |
| 54 | --- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100 |
| 55 | +++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100 |
| 56 | @@ -94,10 +94,10 @@ |
| 57 | |
| 58 | UniqueBackend * unique_backend_create (void); |
| 59 | |
| 60 | -G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); |
| 61 | +const gchar *unique_backend_get_name (UniqueBackend *backend); |
| 62 | void unique_backend_set_name (UniqueBackend *backend, |
| 63 | const gchar *name); |
| 64 | -G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); |
| 65 | +const gchar *unique_backend_get_startup_id (UniqueBackend *backend); |
| 66 | void unique_backend_set_startup_id (UniqueBackend *backend, |
| 67 | const gchar *startup_id); |
| 68 | GdkScreen * unique_backend_get_screen (UniqueBackend *backend); |
| 69 | Index: libunique-1.1.6/unique/uniqueinternals.h |
| 70 | =================================================================== |
| 71 | --- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100 |
| 72 | +++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100 |
| 73 | @@ -44,11 +44,11 @@ |
| 74 | * and then back into an id |
| 75 | */ |
| 76 | UniqueResponse unique_response_from_string (const gchar *response); |
| 77 | -G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); |
| 78 | +const gchar *unique_response_to_string (UniqueResponse response); |
| 79 | |
| 80 | gint unique_command_from_string (UniqueApp *app, |
| 81 | const gchar *command); |
| 82 | -G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, |
| 83 | +const gchar *unique_command_to_string (UniqueApp *app, |
| 84 | gint command); |
| 85 | |
| 86 | G_END_DECLS |
| 87 | Index: libunique-1.1.6/unique/uniquemessage.c |
| 88 | =================================================================== |
| 89 | --- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100 |
| 90 | +++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100 |
| 91 | @@ -185,7 +185,7 @@ |
| 92 | * |
| 93 | * Since: 1.0.2 |
| 94 | */ |
| 95 | -G_CONST_RETURN guchar * |
| 96 | +const guchar * |
| 97 | unique_message_data_get (UniqueMessageData *message_data, |
| 98 | gsize *length) |
| 99 | { |
| 100 | @@ -525,7 +525,7 @@ |
| 101 | * owned by the #UniqueMessageData structure and should not be |
| 102 | * modified or freed |
| 103 | */ |
| 104 | -G_CONST_RETURN gchar * |
| 105 | +const gchar * |
| 106 | unique_message_data_get_startup_id (UniqueMessageData *message_data) |
| 107 | { |
| 108 | g_return_val_if_fail (message_data != NULL, NULL); |
| 109 | Index: libunique-1.1.6/unique/uniquemessage.h |
| 110 | =================================================================== |
| 111 | --- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100 |
| 112 | +++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100 |
| 113 | @@ -48,7 +48,7 @@ |
| 114 | void unique_message_data_set (UniqueMessageData *message_data, |
| 115 | const guchar *data, |
| 116 | gsize length); |
| 117 | -G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, |
| 118 | +const guchar *unique_message_data_get (UniqueMessageData *message_data, |
| 119 | gsize *length); |
| 120 | |
| 121 | gboolean unique_message_data_set_text (UniqueMessageData *message_data, |
| 122 | @@ -63,7 +63,7 @@ |
| 123 | gchar * unique_message_data_get_filename (UniqueMessageData *message_data); |
| 124 | |
| 125 | GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); |
| 126 | -G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); |
| 127 | +const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); |
| 128 | guint unique_message_data_get_workspace (UniqueMessageData *message_data); |
| 129 | |
| 130 | G_END_DECLS |