From cbb6490129f63291003dc7a39e99e783534a80c6 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Tue, 14 Feb 2012 23:02:09 -0800
Subject: [PATCH] Refactor supporting recent changes to guacamole-common-js
 (removal of getLayers() from Guacamole.Client, changes to Guacamole.Client
 constructor prototype, and addition of Guacamole.Client.getDisplay()).

---
 guacamole/src/main/webapp/client.xhtml        |  4 ++-
 .../src/main/webapp/scripts/interface.js      | 26 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index b50e01f8b..e6e2a6ac3 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -103,10 +103,12 @@
 
                     // Instantiate client
                     var guac = new Guacamole.Client(
-                        GuacamoleUI.display,
                         new Guacamole.HTTPTunnel("tunnel")
                     );
 
+                    // Add client to UI
+                    GuacamoleUI.display.appendChild(guac.getDisplay());
+
                     // Tie UI to client
                     GuacamoleUI.attach(guac);
 
diff --git a/guacamole/src/main/webapp/scripts/interface.js b/guacamole/src/main/webapp/scripts/interface.js
index 2b810d2fa..cb1f8f3db 100644
--- a/guacamole/src/main/webapp/scripts/interface.js
+++ b/guacamole/src/main/webapp/scripts/interface.js
@@ -423,32 +423,6 @@ GuacamoleUI.attach = function(guac) {
 
         // Display error message
         GuacamoleUI.showError(error);
-
-        // Show error by desaturating display
-        var layers = guac.getLayers();
-        for (var i=0; i<layers.length; i++) {
-            layers[i].filter(desaturateFilter);
-        }
-
-        // Filter for desaturation
-        function desaturateFilter(data, width, height) {
-
-            for (var i=0; i<data.length; i+=4) {
-
-                // Get RGB values
-                var r = data[i];
-                var g = data[i+1];
-                var b = data[i+2];
-
-                // Desaturate
-                var v = Math.max(r, g, b) / 2;
-                data[i]   = v;
-                data[i+1] = v;
-                data[i+2] = v;
-
-            }
-
-        }
         
     };