Frank Kobzik has uploaded a new change for review. Change subject: frontend: Disabling WAN options for SPICE doesn't work ......................................................................
frontend: Disabling WAN options for SPICE doesn't work SPICE -> Enable WAN options causes 16bit color depth get kept for every console opening for whole browser session even after disabling this option in the console dialog. The problem was caused by not resetting the ColorDepth and DisabledEffects values after disabling WAN options to default values. Change-Id: Ie64779658796243f0182ac1209d9f5640b4370fc Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=913183 Signed-off-by: Frantisek Kobzik <fkob...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java 2 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/14398/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java index 0efcd98..0579f96 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java @@ -367,10 +367,6 @@ return WanColorDepth.depth16.asInt(); } - public List<WANDisableEffects> getWanDisableEffects() { - return wanDisableEffects; - } - public boolean isWanOptionsEnabled() { return wanOptionsEnabled; } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java index 4765d5d..5c3e365 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java @@ -161,9 +161,13 @@ client.UsbAutoShare = usbAutoShare; client.SetUsbFilter(usbFilter); client.Smartcard = smartcardEnabled; + if (wanOptionsEnabled) { client.DisableEffects = disableEffects; client.ColorDepth = colorDepth; + } else { //reset to defaults + client.DisableEffects = ""; + client.ColorDepth = ""; } // only if the proxy is defined in VDC_OPTIONS @@ -316,9 +320,13 @@ client.UsbAutoShare = usbAutoShare; client.SetUsbFilter(usbFilter); client.Smartcard = smartcardEnabled; + if (wanOptionsEnabled) { client.DisableEffects = disableEffects; client.ColorDepth = colorDepth; + }else { //reset to defaults + client.DisableEffects = ""; + client.ColorDepth = ""; } // only if the proxy is defined in VDC_OPTIONS -- To view, visit http://gerrit.ovirt.org/14398 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie64779658796243f0182ac1209d9f5640b4370fc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
