1
diff --git a/unique/dbus/uniquebackend-dbus.c b/unique/dbus/uniquebackend-dbus.c
2
index 3ae1bed..69faa00 100644
3
--- a/unique/dbus/uniquebackend-dbus.c
4
+++ b/unique/dbus/uniquebackend-dbus.c
5
@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (UniqueBackendDBus *backend_dbus)
7
unique_backend_dbus_request_name (UniqueBackend *backend)
9
- UniqueBackendDBus *backend_dbus;
11
DBusGConnection *connection;
13
@@ -97,8 +96,6 @@ unique_backend_dbus_request_name (UniqueBackend *backend)
17
- backend_dbus = UNIQUE_BACKEND_DBUS (backend);
20
name = unique_backend_get_name (backend);
21
g_assert (name != NULL);
22
@@ -207,10 +204,14 @@ unique_backend_dbus_send_message (UniqueBackend *backend,
29
- g_warning ("Error while sending message: %s", error->message);
30
- g_error_free (error);
33
+ g_warning ("Error while sending message: %s", error->message);
34
+ g_error_free (error);
39
return UNIQUE_RESPONSE_INVALID;
40
diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c
41
index 873321d..82bd48f 100644
42
--- a/unique/uniqueapp.c
43
+++ b/unique/uniqueapp.c
44
@@ -782,7 +782,7 @@ unique_app_watch_window (UniqueApp *app,
48
-G_CONST_RETURN gchar *
50
unique_command_to_string (UniqueApp *app,
53
@@ -864,7 +864,7 @@ unique_command_from_string (UniqueApp *app,
57
-G_CONST_RETURN gchar *
59
unique_response_to_string (UniqueResponse response)
61
GEnumClass *enum_class;
62
diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c
63
index a407f72..cfc8a21 100644
64
--- a/unique/uniquebackend.c
65
+++ b/unique/uniquebackend.c
66
@@ -109,7 +109,7 @@ unique_backend_set_name (UniqueBackend *backend,
70
-G_CONST_RETURN gchar *
72
unique_backend_get_name (UniqueBackend *backend)
74
g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
75
@@ -152,7 +152,7 @@ unique_backend_set_startup_id (UniqueBackend *backend,
79
-G_CONST_RETURN gchar *
81
unique_backend_get_startup_id (UniqueBackend *backend)
83
g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
84
diff --git a/unique/uniquebackend.h b/unique/uniquebackend.h
85
index a50ce4e..b19ad3e 100644
86
--- a/unique/uniquebackend.h
87
+++ b/unique/uniquebackend.h
88
@@ -94,10 +94,10 @@ GType unique_backend_get_type (void) G_GNUC_CONST;
90
UniqueBackend * unique_backend_create (void);
92
-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend);
93
+const gchar * unique_backend_get_name (UniqueBackend *backend);
94
void unique_backend_set_name (UniqueBackend *backend,
96
-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend);
97
+const gchar * unique_backend_get_startup_id (UniqueBackend *backend);
98
void unique_backend_set_startup_id (UniqueBackend *backend,
99
const gchar *startup_id);
100
GdkScreen * unique_backend_get_screen (UniqueBackend *backend);
101
diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h
102
index 3cec152..ccae0cd 100644
103
--- a/unique/uniqueinternals.h
104
+++ b/unique/uniqueinternals.h
105
@@ -44,11 +44,11 @@ UniqueResponse unique_app_emit_message_received (UniqueApp *app,
106
* and then back into an id
108
UniqueResponse unique_response_from_string (const gchar *response);
109
-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response);
110
+const gchar * unique_response_to_string (UniqueResponse response);
112
gint unique_command_from_string (UniqueApp *app,
113
const gchar *command);
114
-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app,
115
+const gchar * unique_command_to_string (UniqueApp *app,
119
diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c
120
index e39b531..415c951 100644
121
--- a/unique/uniquemessage.c
122
+++ b/unique/uniquemessage.c
123
@@ -184,7 +184,7 @@ unique_message_data_set (UniqueMessageData *message_data,
127
-G_CONST_RETURN guchar *
129
unique_message_data_get (UniqueMessageData *message_data,
132
@@ -529,7 +529,7 @@ unique_message_data_get_screen (UniqueMessageData *message_data)
133
* owned by the #UniqueMessageData structure and should not be
136
-G_CONST_RETURN gchar *
138
unique_message_data_get_startup_id (UniqueMessageData *message_data)
140
g_return_val_if_fail (message_data != NULL, NULL);
141
diff --git a/unique/uniquemessage.h b/unique/uniquemessage.h
142
index b862d43..b06b048 100644
143
--- a/unique/uniquemessage.h
144
+++ b/unique/uniquemessage.h
145
@@ -48,7 +48,7 @@ void unique_message_data_free (UniqueMessageData *me
146
void unique_message_data_set (UniqueMessageData *message_data,
149
-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data,
150
+const guchar * unique_message_data_get (UniqueMessageData *message_data,
153
gboolean unique_message_data_set_text (UniqueMessageData *message_data,
154
@@ -63,7 +63,7 @@ void unique_message_data_set_filename (UniqueMessageData *me
155
gchar * unique_message_data_get_filename (UniqueMessageData *message_data);
157
GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data);
158
-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
159
+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
160
guint unique_message_data_get_workspace (UniqueMessageData *message_data);