[pve-devel] r5393 - vncterm/pve2/tigerpatches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-01-19 07:41:53 +0100 (Wed, 19 Jan 2011)
New Revision: 5393

Modified:
   vncterm/pve2/tigerpatches/javascript-events.patch
Log:
only get JS Object when run as applet


Modified: vncterm/pve2/tigerpatches/javascript-events.patch
===================================================================
--- vncterm/pve2/tigerpatches/javascript-events.patch	2011-01-18 14:28:31 UTC (rev 5392)
+++ vncterm/pve2/tigerpatches/javascript-events.patch	2011-01-19 06:41:53 UTC (rev 5393)
@@ -1,7 +1,7 @@
 Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
 ===================================================================
---- new.orig/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-18 14:14:34.000000000 +0100
-+++ new/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-18 14:20:35.000000000 +0100
+--- new.orig/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-19 07:05:12.000000000 +0100
++++ new/java/src/com/tigervnc/vncviewer/VncViewer.java	2011-01-19 07:37:43.000000000 +0100
 @@ -27,11 +27,15 @@
  
  package com.tigervnc.vncviewer;
@@ -28,17 +28,19 @@
    // Reference to this applet for inter-applet communication.
    public static java.applet.Applet refApplet;
  
-@@ -104,6 +111,9 @@
+@@ -104,6 +111,11 @@
  
      refApplet = this;
  
-+    jswin = JSObject.getWindow(this);
-+    myid = getParameter("id");
++    if (inAnApplet) {
++      jswin = JSObject.getWindow(this);
++      myid = getParameter("id");
++    }
 +
      if (inSeparateFrame) {
        vncFrame = new Frame("TigerVNC");
        if (!inAnApplet) {
-@@ -134,6 +144,9 @@
+@@ -134,6 +146,9 @@
  
      rfbThread = new Thread(this);
      rfbThread.start();
@@ -48,7 +50,7 @@
    }
  
    public void update(Graphics g) {
-@@ -936,6 +949,8 @@
+@@ -936,6 +951,8 @@
  
      if (inAnApplet) {
        showMessage("Disconnected");
@@ -57,7 +59,7 @@
      } else {
        System.exit(0);
      }
-@@ -953,6 +968,8 @@
+@@ -953,6 +970,8 @@
        // vncContainer null, applet not inited,
        // can not present the error to the user.
        Thread.currentThread().stop();
@@ -66,7 +68,7 @@
      } else {
        System.exit(1);
      }
-@@ -974,6 +991,8 @@
+@@ -974,6 +993,8 @@
        rfb.close();
  
      if (inAnApplet) {
@@ -75,7 +77,7 @@
        showMessage(str);
      } else {
        System.exit(1);
-@@ -1043,6 +1062,9 @@
+@@ -1043,6 +1064,9 @@
        rfb.close();
      if (inSeparateFrame)
        vncFrame.dispose();
@@ -85,7 +87,7 @@
    }
  
    //
-@@ -1091,6 +1113,8 @@
+@@ -1091,6 +1115,8 @@
      if (!inAnApplet) {
        System.exit(0);
      }
@@ -96,8 +98,8 @@
    //
 Index: new/java/src/com/tigervnc/vncviewer/Makefile
 ===================================================================
---- new.orig/java/src/com/tigervnc/vncviewer/Makefile	2011-01-18 14:14:34.000000000 +0100
-+++ new/java/src/com/tigervnc/vncviewer/Makefile	2011-01-18 14:20:56.000000000 +0100
+--- new.orig/java/src/com/tigervnc/vncviewer/Makefile	2011-01-19 07:05:12.000000000 +0100
++++ new/java/src/com/tigervnc/vncviewer/Makefile	2011-01-19 07:33:58.000000000 +0100
 @@ -4,7 +4,10 @@
  
  CP = cp