[Spice-commits] 2 commits - gtk/channel-main.c gtk/spice-session.c

[Marc-André Lureau]

 gtk/channel-main.c  |    5 +++--
 gtk/spice-session.c |   20 +++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 2f89a501363cbfbe1d535ed0fd6014d64b546948
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed Mar 27 13:11:16 2013 +0100

    Be less verbose about monitor config

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 544df1d..1bdacb7 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -1007,8 +1007,9 @@ static void monitors_align(VDAgentMonConfig *monitors, int nmonitors)
         monitors[j].x = x;
         monitors[j].y = 0;
         x += monitors[j].width;
-        g_debug("#%d +%d+%d-%dx%d", j, monitors[j].x, monitors[j].y,
-                monitors[j].width, monitors[j].height);
+        if (monitors[j].width || monitors[j].height)
+            SPICE_DEBUG("#%d +%d+%d-%dx%d", j, monitors[j].x, monitors[j].y,
+                        monitors[j].width, monitors[j].height);
     }
     g_free(sorted_monitors);
 }
commit 7d1d2c61c38d390bd4b17218b95ce5ca446da7fe
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Mar 25 15:42:08 2013 +0100

    session: copy proxy setting
    
    Solve migration falling back to switch-host method when using proxy
    set through controller:
    
    https://bugzilla.redhat.com/show_bug.cgi?id=923894

diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index 6fa8699..e983614 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -1179,13 +1179,17 @@ SpiceSession *spice_session_new_from_session(SpiceSession *session)
                                                     NULL));
     SpiceSessionPrivate *c = copy->priv, *s = session->priv;
 
-    g_warn_if_fail (c->host == NULL);
-    g_warn_if_fail (c->tls_port == NULL);
-    g_warn_if_fail (c->password == NULL);
-    g_warn_if_fail (c->ca_file == NULL);
-    g_warn_if_fail (c->ciphers == NULL);
-    g_warn_if_fail (c->cert_subject == NULL);
-    g_warn_if_fail (c->pubkey == NULL);
+    g_clear_object(&c->proxy);
+
+    g_warn_if_fail(c->host == NULL);
+    g_warn_if_fail(c->tls_port == NULL);
+    g_warn_if_fail(c->password == NULL);
+    g_warn_if_fail(c->ca_file == NULL);
+    g_warn_if_fail(c->ciphers == NULL);
+    g_warn_if_fail(c->cert_subject == NULL);
+    g_warn_if_fail(c->pubkey == NULL);
+    g_warn_if_fail(c->pubkey == NULL);
+    g_warn_if_fail(c->proxy == NULL);
 
     g_object_get(session,
                  "host", &c->host,
@@ -1206,6 +1210,8 @@ SpiceSession *spice_session_new_from_session(SpiceSession *session)
     c->client_provided_sockets = s->client_provided_sockets;
     c->protocol = s->protocol;
     c->connection_id = s->connection_id;
+    if (s->proxy)
+        c->proxy = g_object_ref(s->proxy);
 
     return copy;
 }