[Spice-devel] [PATCH spice-gtk] Adjust to spice_marshaller_add_ref rename

[Victor Toso]

Hi,

On Thu, Dec 08, 2016 at 05:45:05PM +0100, Pavel Grunt wrote:
> It was renamed in the spice-common submodule
>
> Submodule update contains following changes:
>
> Francois Gouget (1):
>       codegen: Fix compatibility with Python 2.6
>
> Frediano Ziglio (9):
>       Start adding protocol file documentation
>       Start writing some documentation on protocol
>       Extended protocol documentation
>       More work on attribute protocol documentation
>       Fix BNF notation in documentation
>       Add protocol documentation for "channel" and "protocol"
>       Define a new SPICE_VERIFY macro
>       Detect LZ4_compress_fast_continue function
>       marshaller: Remove deprecated replacement functions
>
> Jonathon Jongsma (1):
>       Marshaller: rename _add_ref() to _add_by_ref()
>
> Pavel Grunt (5):
>       codegen: Do not generate extra null check
>       silence -Wunused-parameter
>       spice-deps: Fix accidently deleted comment
>       spice-deps: Make LZ4 check depending on function
>       spice-deps: Set python version based on modules availability
>
> Victor Toso (6):
>       build-sys: requires liblz4 129 or newer
>       Fix gitignore with new docs folder
>       canvas-base: use helper to get surface
>       canvas-base: group ifdef and defined together
>       canvas-base: remove user data from CanvasBase
>       sw-canvas: remove unused defines
> ---
>  spice-common           |  2 +-
>  src/channel-base.c     |  2 +-
>  src/channel-usbredir.c | 14 +++++++-------
>  3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/spice-common b/spice-common
> index 62f3024..86dcd22 160000
> --- a/spice-common
> +++ b/spice-common
> @@ -1 +1 @@
> -Subproject commit 62f3024f4220766761269618bf3df143ff5c9956
> +Subproject commit 86dcd22d334a4992718780417bc574623bd61826
> diff --git a/src/channel-base.c b/src/channel-base.c
> index 004dba9..043ea02 100644
> --- a/src/channel-base.c
> +++ b/src/channel-base.c
> @@ -262,7 +262,7 @@ void spice_vmc_write_async(SpiceChannel *self,
>      g_task_set_task_data(task, GSIZE_TO_POINTER(count), NULL);
>
>      msg = spice_msg_out_new(SPICE_CHANNEL(self), SPICE_MSGC_SPICEVMC_DATA);
> -    spice_marshaller_add_ref_full(msg->marshaller, (uint8_t*)buffer, count,
> +    spice_marshaller_add_by_ref_full(msg->marshaller, (uint8_t*)buffer, count,
>                                    vmc_write_free_cb, task);
indentation here ------------------- ^
Acked-by: Victor Toso <victortoso at redhat.com>

>      spice_msg_out_send(msg);
>  }
> diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
> index 4837d68..fef62ce 100644
> --- a/src/channel-usbredir.c
> +++ b/src/channel-usbredir.c
> @@ -706,11 +706,11 @@ static int try_write_compress_LZ4(SpiceUsbredirChannel *channel, uint8_t *data,
>                                                 SPICE_MSGC_SPICEVMC_COMPRESSED_DATA);
>          msg_out_compressed->marshallers->msg_SpiceMsgCompressedData(msg_out_compressed->marshaller,
>                                                                      &compressed_data_msg);
> -        spice_marshaller_add_ref_full(msg_out_compressed->marshaller,
> -                                      compressed_data_msg.compressed_data,
> -                                      compressed_data_count,
> -                                      (spice_marshaller_item_free_func)g_free,
> -                                      channel);
> +        spice_marshaller_add_by_ref_full(msg_out_compressed->marshaller,
> +                                         compressed_data_msg.compressed_data,
> +                                         compressed_data_count,
> +                                         (spice_marshaller_item_free_func)g_free,
> +                                         channel);
>          spice_msg_out_send(msg_out_compressed);
>          return TRUE;
>      }
> @@ -734,8 +734,8 @@ static int usbredir_write_callback(void *user_data, uint8_t *data, int count)
>  #endif
>      msg_out = spice_msg_out_new(SPICE_CHANNEL(channel),
>                                  SPICE_MSGC_SPICEVMC_DATA);
> -    spice_marshaller_add_ref_full(msg_out->marshaller, data, count,
> -                                  usbredir_free_write_cb_data, channel);
> +    spice_marshaller_add_by_ref_full(msg_out->marshaller, data, count,
> +                                     usbredir_free_write_cb_data, channel);
>      spice_msg_out_send(msg_out);
>  
>      return count;
> -- 
> 2.11.0
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20161208/2c6d63e9/attachment.sig>