Revert "Handle if desktopName isn't set.."
This reverts commit 22000b93d5. The
'desktopname' and the 'connect' events are dispatched by us in RFB and
are thus serial.
This commit is contained in:
@@ -1074,15 +1074,11 @@ const UI = {
|
||||
UI.inhibit_reconnect = false;
|
||||
|
||||
let msg;
|
||||
if (UI.desktopName !== '') {
|
||||
if (UI.getSetting('encrypt')) {
|
||||
msg = _("Connected (encrypted) to ") + UI.desktopName;
|
||||
} else {
|
||||
msg = _("Connected (unencrypted) to ") + UI.desktopName;
|
||||
}
|
||||
} else {
|
||||
msg = _("Connected");
|
||||
}
|
||||
UI.showStatus(msg);
|
||||
UI.updateVisualState('connected');
|
||||
|
||||
|
||||
@@ -131,19 +131,11 @@
|
||||
|
||||
function connected(e) {
|
||||
document.getElementById('sendCtrlAltDelButton').disabled = false;
|
||||
|
||||
let encryption;
|
||||
if (WebUtil.getConfigVar('encrypt',
|
||||
(window.location.protocol === "https:"))) {
|
||||
encryption = "unencrypted";
|
||||
status("Connected (encrypted) to " + desktopName, "normal");
|
||||
} else {
|
||||
encryption = "encrypted";
|
||||
}
|
||||
|
||||
if (desktopName) {
|
||||
status("Connected (" + encryption + ") to " + desktopName, "normal");
|
||||
} else {
|
||||
status("Connected (" + encryption + ")", "normal");
|
||||
status("Connected (unencrypted) to " + desktopName, "normal");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user