1 From 557b0e5045c9eadb556ce11e16965cf0d0787438 Mon Sep 17 00:00:00 2001
2 From: Stef Walter <stefw@collabora.co.uk>
3 Date: Tue, 14 Jun 2011 12:33:45 +0100
4 Subject: [PATCH] Remove G_CONST_RETURN usage, now that its gone in glib.
5
6 https://bugzilla.gnome.org/show_bug.cgi?id=652545
7
8 [Alexandre Rostovtsev <tetromino@gmail.com>: backported to unique-1.1]
9 ---
10 unique/uniqueapp.c | 4 ++--
11 unique/uniquebackend.c | 4 ++--
12 unique/uniquebackend.h | 4 ++--
13 unique/uniqueinternals.h | 4 ++--
14 unique/uniquemessage.c | 4 ++--
15 unique/uniquemessage.h | 4 ++--
16 6 files changed, 12 insertions(+), 12 deletions(-)
17
18 diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c
19 index b40a86c..e8edc94 100644
20 --- a/unique/uniqueapp.c
21 +++ b/unique/uniqueapp.c
22 @@ -781,7 +781,7 @@ unique_app_watch_window (UniqueApp *app,
23 }
24
25
26 -G_CONST_RETURN gchar *
27 +const gchar *
28 unique_command_to_string (UniqueApp *app,
29 gint command)
30 {
31 @@ -863,7 +863,7 @@ unique_command_from_string (UniqueApp *app,
32 return retval;
33 }
34
35 -G_CONST_RETURN gchar *
36 +const gchar *
37 unique_response_to_string (UniqueResponse response)
38 {
39 GEnumClass *enum_class;
40 diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c
41 index a76e42e..68e2735 100644
42 --- a/unique/uniquebackend.c
43 +++ b/unique/uniquebackend.c
44 @@ -111,7 +111,7 @@ unique_backend_set_name (UniqueBackend *backend,
45 *
46 * Return value: FIXME
47 */
48 -G_CONST_RETURN gchar *
49 +const gchar *
50 unique_backend_get_name (UniqueBackend *backend)
51 {
52 g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
53 @@ -154,7 +154,7 @@ unique_backend_set_startup_id (UniqueBackend *backend,
54 *
55 * Return value: FIXME
56 */
57 -G_CONST_RETURN gchar *
58 +const gchar *
59 unique_backend_get_startup_id (UniqueBackend *backend)
60 {
61 g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
62 diff --git a/unique/uniquebackend.h b/unique/uniquebackend.h
63 index a50ce4e..b19ad3e 100644
64 --- a/unique/uniquebackend.h
65 +++ b/unique/uniquebackend.h
66 @@ -94,10 +94,10 @@ GType unique_backend_get_type (void) G_GNUC_CONST;
67
68 UniqueBackend * unique_backend_create (void);
69
70 -G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend);
71 +const gchar * unique_backend_get_name (UniqueBackend *backend);
72 void unique_backend_set_name (UniqueBackend *backend,
73 const gchar *name);
74 -G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend);
75 +const gchar * unique_backend_get_startup_id (UniqueBackend *backend);
76 void unique_backend_set_startup_id (UniqueBackend *backend,
77 const gchar *startup_id);
78 GdkScreen * unique_backend_get_screen (UniqueBackend *backend);
79 diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h
80 index 3cec152..ccae0cd 100644
81 --- a/unique/uniqueinternals.h
82 +++ b/unique/uniqueinternals.h
83 @@ -44,11 +44,11 @@ UniqueResponse unique_app_emit_message_received (UniqueApp *app,
84 * and then back into an id
85 */
86 UniqueResponse unique_response_from_string (const gchar *response);
87 -G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response);
88 +const gchar * unique_response_to_string (UniqueResponse response);
89
90 gint unique_command_from_string (UniqueApp *app,
91 const gchar *command);
92 -G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app,
93 +const gchar * unique_command_to_string (UniqueApp *app,
94 gint command);
95
96 G_END_DECLS
97 diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c
98 index c74392d..2b2a9fc 100644
99 --- a/unique/uniquemessage.c
100 +++ b/unique/uniquemessage.c
101 @@ -185,7 +185,7 @@ unique_message_data_set (UniqueMessageData *message_data,
102 *
103 * Since: 1.0.2
104 */
105 -G_CONST_RETURN guchar *
106 +const guchar *
107 unique_message_data_get (UniqueMessageData *message_data,
108 gsize *length)
109 {
110 @@ -525,7 +525,7 @@ unique_message_data_get_screen (UniqueMessageData *message_data)
111 * owned by the #UniqueMessageData structure and should not be
112 * modified or freed
113 */
114 -G_CONST_RETURN gchar *
115 +const gchar *
116 unique_message_data_get_startup_id (UniqueMessageData *message_data)
117 {
118 g_return_val_if_fail (message_data != NULL, NULL);
119 diff --git a/unique/uniquemessage.h b/unique/uniquemessage.h
120 index d3e9c3c..93eee21 100644
121 --- a/unique/uniquemessage.h
122 +++ b/unique/uniquemessage.h
123 @@ -48,7 +48,7 @@ void unique_message_data_free (UniqueMessageData *me
124 void unique_message_data_set (UniqueMessageData *message_data,
125 const guchar *data,
126 gsize length);
127 -G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data,
128 +const guchar * unique_message_data_get (UniqueMessageData *message_data,
129 gsize *length);
130
131 gboolean unique_message_data_set_text (UniqueMessageData *message_data,
132 @@ -63,7 +63,7 @@ void unique_message_data_set_filename (UniqueMessageData *me
133 gchar * unique_message_data_get_filename (UniqueMessageData *message_data);
134
135 GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data);
136 -G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
137 +const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
138 guint unique_message_data_get_workspace (UniqueMessageData *message_data);
139
140 G_END_DECLS
141 --
142 1.7.6
|
