wok view libunique/stuff/remove_G_CONST_RETURN.patch @ rev 17117

Up lilo (24.0), better linux 3.x & GPT support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Sep 04 09:48:47 2014 +0200 (2014-09-04)
parents
children
line source
1 diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c libunique-1.1.6/unique/uniqueapp.c
2 --- libunique-1.1.6.orig/unique/uniqueapp.c 2011-12-01 07:38:17.748122298 +0000
3 +++ libunique-1.1.6/unique/uniqueapp.c 2011-12-01 07:39:59.132319788 +0000
4 @@ -781,7 +781,7 @@
5 }
6
7
8 -G_CONST_RETURN gchar *
9 +const gchar *
10 unique_command_to_string (UniqueApp *app,
11 gint command)
12 {
13 @@ -863,7 +863,7 @@
14 return retval;
15 }
16
17 -G_CONST_RETURN gchar *
18 +const gchar *
19 unique_response_to_string (UniqueResponse response)
20 {
21 GEnumClass *enum_class;
22 diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c libunique-1.1.6/unique/uniquebackend.c
23 --- libunique-1.1.6.orig/unique/uniquebackend.c 2011-12-01 07:38:17.748122298 +0000
24 +++ libunique-1.1.6/unique/uniquebackend.c 2011-12-01 07:39:24.418677950 +0000
25 @@ -111,7 +111,7 @@
26 *
27 * Return value: FIXME
28 */
29 -G_CONST_RETURN gchar *
30 +const gchar *
31 unique_backend_get_name (UniqueBackend *backend)
32 {
33 g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
34 @@ -154,7 +154,7 @@
35 *
36 * Return value: FIXME
37 */
38 -G_CONST_RETURN gchar *
39 +const gchar *
40 unique_backend_get_startup_id (UniqueBackend *backend)
41 {
42 g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
43 diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h libunique-1.1.6/unique/uniquebackend.h
44 --- libunique-1.1.6.orig/unique/uniquebackend.h 2011-12-01 07:38:17.748122298 +0000
45 +++ libunique-1.1.6/unique/uniquebackend.h 2011-12-01 07:42:13.833467492 +0000
46 @@ -94,10 +94,10 @@
47
48 UniqueBackend * unique_backend_create (void);
49
50 -G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend);
51 +const gchar *unique_backend_get_name (UniqueBackend *backend);
52 void unique_backend_set_name (UniqueBackend *backend,
53 const gchar *name);
54 -G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend);
55 +const gchar *unique_backend_get_startup_id (UniqueBackend *backend);
56 void unique_backend_set_startup_id (UniqueBackend *backend,
57 const gchar *startup_id);
58 GdkScreen * unique_backend_get_screen (UniqueBackend *backend);
59 diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h libunique-1.1.6/unique/uniqueinternals.h
60 --- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-12-01 07:38:17.748122298 +0000
61 +++ libunique-1.1.6/unique/uniqueinternals.h 2011-12-01 07:41:17.142977914 +0000
62 @@ -44,11 +44,11 @@
63 * and then back into an id
64 */
65 UniqueResponse unique_response_from_string (const gchar *response);
66 -G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response);
67 +const gchar *unique_response_to_string (UniqueResponse response);
68
69 gint unique_command_from_string (UniqueApp *app,
70 const gchar *command);
71 -G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app,
72 +const gchar *unique_command_to_string (UniqueApp *app,
73 gint command);
74
75 G_END_DECLS
76 diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c libunique-1.1.6/unique/uniquemessage.c
77 --- libunique-1.1.6.orig/unique/uniquemessage.c 2011-12-01 07:38:17.748122298 +0000
78 +++ libunique-1.1.6/unique/uniquemessage.c 2011-12-01 07:41:45.743225713 +0000
79 @@ -185,7 +185,7 @@
80 *
81 * Since: 1.0.2
82 */
83 -G_CONST_RETURN guchar *
84 +const guchar *
85 unique_message_data_get (UniqueMessageData *message_data,
86 gsize *length)
87 {
88 @@ -525,7 +525,7 @@
89 * owned by the #UniqueMessageData structure and should not be
90 * modified or freed
91 */
92 -G_CONST_RETURN gchar *
93 +const gchar *
94 unique_message_data_get_startup_id (UniqueMessageData *message_data)
95 {
96 g_return_val_if_fail (message_data != NULL, NULL);
97 diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h libunique-1.1.6/unique/uniquemessage.h
98 --- libunique-1.1.6.orig/unique/uniquemessage.h 2011-12-01 07:38:17.748122298 +0000
99 +++ libunique-1.1.6/unique/uniquemessage.h 2011-12-01 07:40:47.576064565 +0000
100 @@ -48,7 +48,7 @@
101 void unique_message_data_set (UniqueMessageData *message_data,
102 const guchar *data,
103 gsize length);
104 -G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data,
105 +const guchar *unique_message_data_get (UniqueMessageData *message_data,
106 gsize *length);
107
108 gboolean unique_message_data_set_text (UniqueMessageData *message_data,
109 @@ -63,7 +63,7 @@
110 gchar * unique_message_data_get_filename (UniqueMessageData *message_data);
111
112 GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data);
113 -G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
114 +const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
115 guint unique_message_data_get_workspace (UniqueMessageData *message_data);
116
117 G_END_DECLS