libunique1/libunique-1.1.6-glib-2.32.patch

137 lines
6.1 KiB
Diff

diff -ru libunique-1.1.6/unique/uniqueapp.c libunique-1.1.6.patched/unique/uniqueapp.c
--- libunique-1.1.6/unique/uniqueapp.c 2009-11-01 19:33:13.000000000 +0100
+++ libunique-1.1.6.patched/unique/uniqueapp.c 2012-06-08 15:12:16.922173107 +0200
@@ -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;
Solo in libunique-1.1.6.patched/unique: uniqueapp.lo
Solo in libunique-1.1.6.patched/unique: uniqueapp.o
diff -ru libunique-1.1.6/unique/uniquebackend.c libunique-1.1.6.patched/unique/uniquebackend.c
--- libunique-1.1.6/unique/uniquebackend.c 2009-11-09 12:02:06.000000000 +0100
+++ libunique-1.1.6.patched/unique/uniquebackend.c 2012-06-08 15:12:39.836928820 +0200
@@ -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);
diff -ru libunique-1.1.6/unique/uniquebackend.h libunique-1.1.6.patched/unique/uniquebackend.h
--- libunique-1.1.6/unique/uniquebackend.h 2009-09-21 14:31:14.000000000 +0200
+++ libunique-1.1.6.patched/unique/uniquebackend.h 2012-06-08 15:10:42.170183223 +0200
@@ -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);
Solo in libunique-1.1.6.patched/unique: uniquebackend.lo
Solo in libunique-1.1.6.patched/unique: uniquebackend.o
Solo in libunique-1.1.6.patched/unique: uniqueenumtypes.lo
Solo in libunique-1.1.6.patched/unique: uniqueenumtypes.o
diff -ru libunique-1.1.6/unique/uniqueinternals.h libunique-1.1.6.patched/unique/uniqueinternals.h
--- libunique-1.1.6/unique/uniqueinternals.h 2009-09-21 14:31:14.000000000 +0200
+++ libunique-1.1.6.patched/unique/uniqueinternals.h 2012-06-08 15:11:34.974620293 +0200
@@ -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
Solo in libunique-1.1.6.patched/unique: uniquemarshal.lo
Solo in libunique-1.1.6.patched/unique: uniquemarshal.o
diff -ru libunique-1.1.6/unique/uniquemessage.c libunique-1.1.6.patched/unique/uniquemessage.c
--- libunique-1.1.6/unique/uniquemessage.c 2009-11-09 12:02:06.000000000 +0100
+++ libunique-1.1.6.patched/unique/uniquemessage.c 2012-06-08 15:13:39.156296439 +0200
@@ -146,7 +146,7 @@
void
unique_message_data_set (UniqueMessageData *message_data,
const guchar *data,
- gsize length)
+ gssize length)
{
g_return_if_fail (message_data != NULL);
@@ -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);
diff -ru libunique-1.1.6/unique/uniquemessage.h libunique-1.1.6.patched/unique/uniquemessage.h
--- libunique-1.1.6/unique/uniquemessage.h 2009-09-21 14:31:14.000000000 +0200
+++ libunique-1.1.6.patched/unique/uniquemessage.h 2012-06-08 15:09:32.697148369 +0200
@@ -47,8 +47,8 @@
void unique_message_data_set (UniqueMessageData *message_data,
const guchar *data,
- gsize length);
-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data,
+ gssize length);
+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