mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2025-01-20 23:39:51 +01:00
Tidy up XSVNCScreen
: use built-in type references
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
This commit is contained in:
parent
5ba0a42bd5
commit
bcb3fdc00a
@ -87,7 +87,7 @@ namespace XenAdmin.ConsoleView
|
|||||||
private VM sourceVM;
|
private VM sourceVM;
|
||||||
private bool sourceIsPV;
|
private bool sourceIsPV;
|
||||||
|
|
||||||
private readonly Object hostedConsolesLock = new Object();
|
private readonly object hostedConsolesLock = new object();
|
||||||
private List<XenRef<Console>> hostedConsoles;
|
private List<XenRef<Console>> hostedConsoles;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -97,7 +97,7 @@ namespace XenAdmin.ConsoleView
|
|||||||
/// the activeSessionLock.
|
/// the activeSessionLock.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private Session activeSession;
|
private Session activeSession;
|
||||||
private readonly Object activeSessionLock = new Object();
|
private readonly object activeSessionLock = new object();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Xvnc will block us if we're too quick with the disconnect and reconnect that we do
|
/// Xvnc will block us if we're too quick with the disconnect and reconnect that we do
|
||||||
@ -107,7 +107,7 @@ namespace XenAdmin.ConsoleView
|
|||||||
/// Dispose.
|
/// Dispose.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private Stream pendingVNCConnection;
|
private Stream pendingVNCConnection;
|
||||||
private readonly Object pendingVNCConnectionLock = new Object();
|
private readonly object pendingVNCConnectionLock = new object();
|
||||||
|
|
||||||
internal EventHandler ResizeHandler;
|
internal EventHandler ResizeHandler;
|
||||||
|
|
||||||
@ -515,7 +515,7 @@ namespace XenAdmin.ConsoleView
|
|||||||
Program.AssertOnEventThread();
|
Program.AssertOnEventThread();
|
||||||
|
|
||||||
//When switch to RDP from VNC, if RDP IP is empty, do not try to switch.
|
//When switch to RDP from VNC, if RDP IP is empty, do not try to switch.
|
||||||
if (String.IsNullOrEmpty(RdpIp) && !UseVNC && RemoteConsole != null)
|
if (string.IsNullOrEmpty(RdpIp) && !UseVNC && RemoteConsole != null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
bool wasFocused = false;
|
bool wasFocused = false;
|
||||||
@ -547,7 +547,7 @@ namespace XenAdmin.ConsoleView
|
|||||||
// Reset
|
// Reset
|
||||||
haveTriedLoginWithoutPassword = false;
|
haveTriedLoginWithoutPassword = false;
|
||||||
|
|
||||||
if (UseVNC || String.IsNullOrEmpty(RdpIp))
|
if (UseVNC || string.IsNullOrEmpty(RdpIp))
|
||||||
{
|
{
|
||||||
AutoScroll = false;
|
AutoScroll = false;
|
||||||
AutoScrollMinSize = new Size(0, 0);
|
AutoScrollMinSize = new Size(0, 0);
|
||||||
@ -1072,7 +1072,7 @@ namespace XenAdmin.ConsoleView
|
|||||||
|
|
||||||
private Stream connectGuest(string ip_address, int port, IXenConnection connection)
|
private Stream connectGuest(string ip_address, int port, IXenConnection connection)
|
||||||
{
|
{
|
||||||
string uriString = String.Format("http://{0}:{1}/", ip_address, port);
|
string uriString = string.Format("http://{0}:{1}/", ip_address, port);
|
||||||
Log.DebugFormat("Trying to connect to: {0}", uriString);
|
Log.DebugFormat("Trying to connect to: {0}", uriString);
|
||||||
return HTTP.ConnectStream(new Uri(uriString), XenAdminConfigManager.Provider.GetProxyFromSettings(connection), true, 0);
|
return HTTP.ConnectStream(new Uri(uriString), XenAdminConfigManager.Provider.GetProxyFromSettings(connection), true, 0);
|
||||||
}
|
}
|
||||||
@ -1145,7 +1145,7 @@ namespace XenAdmin.ConsoleView
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String errorMessage;
|
private string errorMessage;
|
||||||
|
|
||||||
private void ErrorHandler(object sender, Exception exn)
|
private void ErrorHandler(object sender, Exception exn)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user