2 files changed, 9 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index f3541b5bb3..cb6874075c 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -899,6 +899,12 @@ public class ApplicationConnection {
     }
 
     public void updateVariable(String paintableId, String variableName,
+            Paintable newValue, boolean immediate) {
+        String pid = (newValue != null) ? getPid(newValue) : null;
+        addVariableToQueue(paintableId, variableName, pid, immediate, 'p');
+    }
+
+    public void updateVariable(String paintableId, String variableName,
             String newValue, boolean immediate) {
         addVariableToQueue(paintableId, variableName, newValue, immediate, 's');
     }
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
index cfedb42dc4..0b92701363 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
@@ -867,6 +867,9 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
         case 'b':
             val = Boolean.valueOf(strValue);
             break;
+        case 'p':
+            val = idPaintableMap.get(strValue);
+            break;
         }
 
         return val;