This one looks fine to me now
Acked-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
On Thu, 2016-04-21 at 16:43 -0500, Jonathon Jongsma wrote:
> From: Christophe Fergeau <cfergeau@xxxxxxxxxx>
>
> ---
> Changes since last version:
> - split out debug warnings from this patch
>
> server/spice-migration.h | 6 +++---
> server/spice-server.h | 12 +++++++-----
> 2 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/server/spice-migration.h b/server/spice-migration.h
> index 51c6444..944e133 100644
> --- a/server/spice-migration.h
> +++ b/server/spice-migration.h
> @@ -46,8 +46,8 @@ struct SpiceMigrateInstance {
> /* spice switch-host client migration */
> int spice_server_migrate_info(SpiceServer *s, const char* dest,
> int port, int secure_port,
> - const char* cert_subject);
> -int spice_server_migrate_switch(SpiceServer *s);
> + const char* cert_subject) G_GNUC_DEPRECATED;
> +int spice_server_migrate_switch(SpiceServer *s) G_GNUC_DEPRECATED;
>
> /* spice (semi-)seamless client migration */
> int spice_server_migrate_connect(SpiceServer *s, const char* dest,
> @@ -56,6 +56,6 @@ int spice_server_migrate_connect(SpiceServer *s, const char*
> dest,
> int spice_server_migrate_start(SpiceServer *s);
> int spice_server_migrate_end(SpiceServer *s, int completed);
>
> -void spice_server_set_seamless_migration(SpiceServer *s, int enable);
> +void spice_server_set_seamless_migration(SpiceServer *s, int enable)
> G_GNUC_DEPRECATED;
>
> #endif /* SPICE_MIGRATION_H_ */
> diff --git a/server/spice-server.h b/server/spice-server.h
> index c2ff61d..d309f18 100644
> --- a/server/spice-server.h
> +++ b/server/spice-server.h
> @@ -22,6 +22,8 @@
> #error "Only spice.h can be included directly."
> #endif
>
> +#include <glib.h>
> +
> #include "spice-core.h"
>
> /* Don't use features incompatible with a specific spice
> @@ -48,7 +50,7 @@ int spice_server_set_compat_version(SpiceServer *s,
> spice_compat_version_t version);
> int spice_server_set_port(SpiceServer *s, int port);
> void spice_server_set_addr(SpiceServer *s, const char *addr, int flags);
> -int spice_server_set_listen_socket_fd(SpiceServer *s, int listen_fd);
> +int spice_server_set_listen_socket_fd(SpiceServer *s, int listen_fd)
> G_GNUC_DEPRECATED;
> int spice_server_set_exit_on_disconnect(SpiceServer *s, int flag);
> int spice_server_set_noauth(SpiceServer *s);
> int spice_server_set_sasl(SpiceServer *s, int enabled);
> @@ -97,7 +99,7 @@ int spice_server_set_zlib_glz_compression(SpiceServer *s,
> spice_wan_compression_
>
> int spice_server_set_channel_security(SpiceServer *s, const char *channel,
> int security);
>
> -int spice_server_add_renderer(SpiceServer *s, const char *name);
> +int spice_server_add_renderer(SpiceServer *s, const char *name)
> G_GNUC_DEPRECATED;
>
> enum {
> SPICE_STREAM_VIDEO_INVALID,
> @@ -112,8 +114,8 @@ int spice_server_set_agent_mouse(SpiceServer *s, int
> enable);
> int spice_server_set_agent_copypaste(SpiceServer *s, int enable);
> int spice_server_set_agent_file_xfer(SpiceServer *s, int enable);
>
> -int spice_server_get_sock_info(SpiceServer *s, struct sockaddr *sa, socklen_t
> *salen);
> -int spice_server_get_peer_info(SpiceServer *s, struct sockaddr *sa, socklen_t
> *salen);
> +int spice_server_get_sock_info(SpiceServer *s, struct sockaddr *sa, socklen_t
> *salen) G_GNUC_DEPRECATED;
> +int spice_server_get_peer_info(SpiceServer *s, struct sockaddr *sa, socklen_t
> *salen) G_GNUC_DEPRECATED;
>
> int spice_server_is_server_mouse(SpiceServer *s);
>
> @@ -123,6 +125,6 @@ void spice_server_set_uuid(SpiceServer *s, const uint8_t
> uuid[16]);
> void spice_server_vm_start(SpiceServer *s);
> void spice_server_vm_stop(SpiceServer *s);
>
> -int spice_server_get_num_clients(SpiceServer *s);
> +int spice_server_get_num_clients(SpiceServer *s) G_GNUC_DEPRECATED;
>
> #endif /* SPICE_SERVER_H_ */
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel