[Spice-commits] 2 commits - src/channel-main.c src/spice-widget.c

[GitLab Mirror]

 src/channel-main.c |    2 ++
 src/spice-widget.c |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 8d60d4fc3fe0bd620f216091b24bbb8b72bb055a
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Aug 17 14:36:05 2020 +0400

    main: add a few missing vdagent capability descriptions
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/src/channel-main.c b/src/channel-main.c
index 3dd94a2..671716a 100644
--- a/src/channel-main.c
+++ b/src/channel-main.c
@@ -222,6 +222,8 @@ static const char *agent_caps[] = {
     [ VD_AGENT_CAP_AUDIO_VOLUME_SYNC   ] = "volume-sync",
     [ VD_AGENT_CAP_MONITORS_CONFIG_POSITION ] = "monitors config position",
     [ VD_AGENT_CAP_FILE_XFER_DISABLED ] = "file transfer disabled",
+    [ VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS ] = "file transfer detailed errors",
+    [ VD_AGENT_CAP_GRAPHICS_DEVICE_INFO ] = "graphics device info",
     [ VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_ON_REGRAB ] = "no release on re-grab",
     [ VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL ] = "clipboard grab serial",
 };
commit 76baab8ae8fca845713976a08d158928ed96f386
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed Aug 12 12:56:39 2020 +0400

    gtk: remove redundant monitor id from log
    
    Since commit 162531a1c0010ec1495bb457317b621debab6203, the
    channel/monitor IDs are already printed.
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/src/spice-widget.c b/src/spice-widget.c
index 6e0fa54..9cb1273 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -1366,9 +1366,8 @@ static void recalc_geometry(GtkWidget *widget)
     scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
 
     DISPLAY_DEBUG(display,
-                  "recalc geom monitor: %d:%d, guest +%d+%d:%dx%d, window %dx%d, zoom %g, scale %d",
-                  d->channel_id, d->monitor_id, d->area.x, d->area.y,
-                  d->area.width, d->area.height,
+                  "recalc geom: guest +%d+%d:%dx%d, window %dx%d, zoom %g, scale %d",
+                  d->area.x, d->area.y, d->area.width, d->area.height,
                   d->ww, d->wh, zoom, scale_factor);
 
     if (d->resize_guest_enable)