[Spice-commits] server/dcc-send.c spice-common

[GitLab Mirror]

 server/dcc-send.c |    2 +-
 spice-common      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e25e7dc00b8042d9a699c5b2b72e4f5d34e604fd
Author: Lukáš Hrázký <lhrazky at redhat.com>
Date:   Tue Jul 17 17:22:31 2018 +0200

    Rename SpiceHead::id to monitor_id in the protocol
    
    Signed-off-by: Lukáš Hrázký <lhrazky at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/dcc-send.c b/server/dcc-send.c
index 79c3d48b..e19ee19c 100644
--- a/server/dcc-send.c
+++ b/server/dcc-send.c
@@ -2294,7 +2294,7 @@ static void marshall_monitors_config(RedChannelClient *rcc, SpiceMarshaller *bas
         if (monitors_config->heads[i].width == 0 || monitors_config->heads[i].height == 0) {
             continue;
         }
-        msg->heads[count].id = monitors_config->heads[i].id;
+        msg->heads[count].monitor_id = monitors_config->heads[i].id;
         msg->heads[count].surface_id = monitors_config->heads[i].surface_id;
         msg->heads[count].width = monitors_config->heads[i].width;
         msg->heads[count].height = monitors_config->heads[i].height;
diff --git a/spice-common b/spice-common
index f4a0fec5..f82a6c53 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit f4a0fec5e9c1d37f01386530f921026d9d3e1c1c
+Subproject commit f82a6c5349a9a71485910bd3a57fe588c49d74f8