pxcloud/spice-gtk
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk synced 2026-01-11 08:28:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build-sys: replace SPICE_DEPRECATED with G_DEPRECATED

Browse Source 
The generic G_DEPRECATED* macros got introduced in 2.32, and spice-gtk
depends on 2.36. We can drop our own.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Marc-André Lureau 2017-06-15 15:43:51 +04:00
parent 90ccba3487
commit da97aed71e
6 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/reference/spice-gtk-sections.txt
View File

@ -434,10 +434,7 @@ spice_uuid_to_string
SPICE_DEBUG
spice_util_get_debug
SPICE_RESERVED_PADDING
SPICE_DEPRECATED_FOR
spice_g_signal_connect_object
SPICE_DEPRECATED
SPICE_GNUC_DEPRECATED_FOR
</SECTION>
<SECTION>

8
src/channel-main.h
View File

@ -101,13 +101,13 @@ gboolean spice_main_file_copy_finish(SpiceMainChannel *channel,
void spice_main_request_mouse_mode(SpiceMainChannel *channel, int mode);
#ifndef SPICE_DISABLE_DEPRECATED
SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_grab)
G_DEPRECATED_FOR(spice_main_clipboard_selection_grab)
void spice_main_clipboard_grab(SpiceMainChannel *channel, guint32 *types, int ntypes);
SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_release)
G_DEPRECATED_FOR(spice_main_clipboard_selection_release)
void spice_main_clipboard_release(SpiceMainChannel *channel);
SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_notify)
G_DEPRECATED_FOR(spice_main_clipboard_selection_notify)
void spice_main_clipboard_notify(SpiceMainChannel *channel, guint32 type, const guchar *data, size_t size);
SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_request)
G_DEPRECATED_FOR(spice_main_clipboard_selection_request)
void spice_main_clipboard_request(SpiceMainChannel *channel, guint32 type);
#endif

2
src/spice-audio.h
View File

@ -104,7 +104,7 @@ GType spice_audio_get_type(void);
SpiceAudio* spice_audio_get(SpiceSession *session, GMainContext *context);
#ifndef SPICE_DISABLE_DEPRECATED
SPICE_DEPRECATED_FOR(spice_audio_get)
G_DEPRECATED_FOR(spice_audio_get)
SpiceAudio* spice_audio_new(SpiceSession *session, GMainContext *context, const char *name);
#endif

5
src/spice-channel.h
View File

@ -24,7 +24,6 @@
#include <gio/gio.h>
#include <spice/macros.h>
#include "spice-types.h"
#include "spice-glib-enums.h"
#include "spice-util.h"
@ -137,9 +136,9 @@ gboolean spice_channel_test_common_capability(SpiceChannel *channel, guint32 cap
void spice_channel_flush_async(SpiceChannel *channel, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
gboolean spice_channel_flush_finish(SpiceChannel *channel, GAsyncResult *result, GError **error);
#ifndef SPICE_DISABLE_DEPRECATED
SPICE_GNUC_DEPRECATED
G_DEPRECATED
void spice_channel_set_capability(SpiceChannel *channel, guint32 cap);
SPICE_GNUC_DEPRECATED
G_DEPRECATED
void spice_channel_destroy(SpiceChannel *channel);
#endif

10
src/spice-util.h
View File

@ -40,16 +40,6 @@ gchar* spice_uuid_to_string(const guint8 uuid[16]);
#define SPICE_RESERVED_PADDING (10 * sizeof(void*))
/* need to be in a public header */
#ifndef SPICE_DEPRECATED_FOR
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
#define SPICE_DEPRECATED_FOR(f) \
__attribute__((deprecated("Use " #f " instead")))
#else
#define SPICE_DEPRECATED_FOR(f) G_GNUC_DEPRECATED
#endif /* __GNUC__ */
#endif
G_END_DECLS
#endif /* SPICE_UTIL_H */

2
src/usb-device-manager.h
View File

@ -131,7 +131,7 @@ gboolean spice_usb_device_manager_disconnect_device_finish(
SpiceUsbDeviceManager *self, GAsyncResult *res, GError **err);
#ifndef SPICE_DISABLE_DEPRECATED
SPICE_DEPRECATED_FOR(spice_usb_device_manager_disconnect_device_async)
G_DEPRECATED_FOR(spice_usb_device_manager_disconnect_device_async)
void spice_usb_device_manager_disconnect_device(SpiceUsbDeviceManager *manager,
SpiceUsbDevice *device);
#endif