[PATCH spice-gtk] channel-main: Don't send empty monitor config on main_init with agent

[Hans de Goede <hdegoede@xxxxxxxxxx>]

Currently we send a monitor-config on any agent_start, including sending it if
the agent is already started when the main channel connects, but when the main
channel gets initialized, the display channels aren't intialized yet, so our
monitor config will be empty. Resulting in the Linux agent logging:

spice-vdagent[1285]: err: client sent config with all monitors disabled

This patch fixing this by only sending our monitor-config to the agent when
it (re)starts later on.

Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
---
 gtk/channel-main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 1c61e31..b4f8b04 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -1348,8 +1348,6 @@ static void set_agent_connected(SpiceMainChannel *channel, gboolean connected)
         c->agent_connected = connected;
         g_object_notify_main_context(G_OBJECT(channel), "agent-connected");
     }
-
-    update_display_timer(channel, 0);
 }
 
 /* coroutine context  */
@@ -1522,6 +1520,7 @@ static void main_handle_mouse_mode(SpiceChannel *channel, SpiceMsgIn *in)
 static void main_handle_agent_connected(SpiceChannel *channel, SpiceMsgIn *in)
 {
     agent_start(SPICE_MAIN_CHANNEL(channel));
+    update_display_timer(SPICE_MAIN_CHANNEL(channel), 0);
 }
 
 /* coroutine context */
@@ -1532,6 +1531,7 @@ static void main_handle_agent_connected_tokens(SpiceChannel *channel, SpiceMsgIn
 
     c->agent_tokens = msg->num_tokens;
     agent_start(SPICE_MAIN_CHANNEL(channel));
+    update_display_timer(SPICE_MAIN_CHANNEL(channel), 0);
 }
 
 /* coroutine context */
-- 
1.8.1.4

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel