[Spice-commits] spice-common src/channel-display.c

[GitLab Mirror]

 spice-common          |    2 +-
 src/channel-display.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 67ab780aa0a692efd3d68af1e2255d94a59f4a24
Author: Lukáš Hrázký <lhrazky at redhat.com>
Date:   Tue Jul 17 17:22:32 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/spice-common b/spice-common
index f4a0fec..f82a6c5 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit f4a0fec5e9c1d37f01386530f921026d9d3e1c1c
+Subproject commit f82a6c5349a9a71485910bd3a57fe588c49d74f8
diff --git a/src/channel-display.c b/src/channel-display.c
index 993d9b7..54f40ba 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -1896,9 +1896,9 @@ static void display_handle_monitors_config(SpiceChannel *channel, SpiceMsgIn *in
         SpiceDisplayMonitorConfig *mc = &g_array_index(c->monitors, SpiceDisplayMonitorConfig, i);
         SpiceHead *head = &config->heads[i];
         CHANNEL_DEBUG(channel, "monitor id: %u, surface id: %u, +%u+%u-%ux%u",
-                    head->id, head->surface_id,
+                    head->monitor_id, head->surface_id,
                     head->x, head->y, head->width, head->height);
-        mc->id = head->id;
+        mc->id = head->monitor_id;
         mc->surface_id = head->surface_id;
         mc->x = head->x;
         mc->y = head->y;