[gnome-boxes/gnome-3-20] spice-display: No URI for local private case



commit b2b0682aa86c458bcc9c5a12d9541f9387c1752b
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Apr 21 17:19:19 2016 +0100

    spice-display: No URI for local private case
    
    In case of local private connection, a URI is irrelevant so let's not
    ask Spice.Session to create a URI in this case as it'll fail to do so.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=738573

 src/spice-display.vala |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/src/spice-display.vala b/src/spice-display.vala
index 6a2ac0c..4826efd 100644
--- a/src/spice-display.vala
+++ b/src/spice-display.vala
@@ -5,7 +5,14 @@ using LibUSB;
 
 private class Boxes.SpiceDisplay: Boxes.Display {
     public override string protocol { get { return "SPICE"; } }
-    public override string? uri { owned get { return session.uri; } }
+    public override string? uri {
+        owned get {
+            if (session.port == null && session.tls_port == null)
+                return null;
+
+            return session.uri;
+        }
+    }
     public GLib.ByteArray ca_cert { owned get { return session.ca; } set { session.ca = value; } }
 
     private weak Machine machine; // Weak ref for avoiding cyclic ref


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]