[Spice-commits] 2 commits - src/channel-smartcard.c subprojects/spice-common

[GitLab Mirror]

 src/channel-smartcard.c  |    2 +-
 subprojects/spice-common |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d071e48bfb57e34f6c3ac7f0fec870dd5658deee
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Apr 7 11:35:44 2020 +0100

    channel-smartcard: Update due to spice-common cleanup
    
    After commit 47e149705a5bb1d4a615facfd9bd0190d9b0647c
    (cfr "proto: Generate correct constants for smartcard support")
    msgc_smartcard_header was renamed to a more proper
    msgc_smartcard_data.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/src/channel-smartcard.c b/src/channel-smartcard.c
index aad5f8f..9826647 100644
--- a/src/channel-smartcard.c
+++ b/src/channel-smartcard.c
@@ -345,7 +345,7 @@ send_msg_generic_with_data(SpiceSmartcardChannel *channel, VReader *reader,
 
     msg_out = spice_msg_out_new(SPICE_CHANNEL(channel),
                                 SPICE_MSGC_SMARTCARD_DATA);
-    msg_out->marshallers->msgc_smartcard_header(msg_out->marshaller, &header);
+    msg_out->marshallers->msgc_smartcard_data(msg_out->marshaller, &header);
     if ((data != NULL) && (data_len != 0)) {
         spice_marshaller_add(msg_out->marshaller, data, data_len);
     }
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 81f0331..47e1497 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 81f0331469e906401bb8ef7b2b815877d298071c
+Subproject commit 47e149705a5bb1d4a615facfd9bd0190d9b0647c
commit b8a9fb71cbd08c2d15c03b324b54702e06ad4f11
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Apr 7 11:33:48 2020 +0100

    Update spice-common submodule
    
    This brings in the following changes:
    
    Frediano Ziglio (7):
          ci: Fix build of spice-protocol
          lz_common: Remove unused commented out define
          test-logging: Do not use G_PASTE to join level
          ci: Use spice-protocol master for make-win job
          build: Allow to build disabling code generation
          proto: Allows to specify @deprecated option for flags and enums
          messages: Remove obsolete structure definition
    
    Kevin Pouget (1):
          spice.proto: add quality_indicator messages
    
    Victor Toso (1):
          sound: remove celt support
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/subprojects/spice-common b/subprojects/spice-common
index 11009d1..81f0331 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 11009d1b64387ad7bec9e669039fc41a0411c918
+Subproject commit 81f0331469e906401bb8ef7b2b815877d298071c