[Spice-commits] 2 commits - spiceconn.js

[Pavel Grunt]

 spiceconn.js |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 53b6063f51f1d5439b2be6c5633aa8fbf88e6221
Author: Oliver Gutierrez <ogutierrez at redhat.com>
Date:   Mon Sep 5 10:48:06 2016 +0200

    Added debug filtering to avoid debugger to start when using in production

diff --git a/spiceconn.js b/spiceconn.js
index 9707818..010a446 100644
--- a/spiceconn.js
+++ b/spiceconn.js
@@ -23,7 +23,7 @@
 **      This is the base Javascript class for establishing and
 **  managing a connection to a Spice Server.
 **  It is used to provide core functionality to the Spice main,
-**  display, inputs, and cursor channels.  See main.js for 
+**  display, inputs, and cursor channels.  See main.js for
 **  usage.
 **--------------------------------------------------------------------------*/
 function SpiceConn(o)
@@ -189,8 +189,8 @@ SpiceConn.prototype =
 
                 if (msg.type > 500)
                 {
-                    alert("Something has gone very wrong; we think we have message of type " + msg.type);
-                    debugger;
+                    DEBUG > 0 && alert("Something has gone very wrong; we think we have message of type " + msg.type);
+                    DEBUG > 0 && debugger;
                 }
 
                 if (msg.size == 0)
commit 579f2bfb27475395b08c63f151fdce73d4bbb5f7
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Fri Sep 2 16:37:11 2016 +0200

    spiceconn: Set channel id
    
    Allow to work with more channels of one type
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=97575
    
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/spiceconn.js b/spiceconn.js
index 41d2fa3..9707818 100644
--- a/spiceconn.js
+++ b/spiceconn.js
@@ -119,7 +119,8 @@ SpiceConn.prototype =
 
         msg.connection_id = this.connection_id;
         msg.channel_type = this.type;
-        // FIXME - we're not setting a channel_id...
+        msg.channel_id = this.chan_id;
+
         msg.common_caps.push(
             (1 << SPICE_COMMON_CAP_PROTOCOL_AUTH_SELECTION) |
             (1 << SPICE_COMMON_CAP_MINI_HEADER)