[Spice-commits] gtk/channel-main.c

[Hans de Goede]

 gtk/channel-main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 715359ffa84cfe86bfb8ccece8cfe7043fac61ee
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Mar 28 22:57:02 2013 +0100

    channel-main: Don't send empty monitor config on main_init with agent
    
    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 at redhat.com>

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index b041349..78ece08 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -1324,8 +1324,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  */
@@ -1501,6 +1499,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 */
@@ -1511,6 +1510,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 */