Changes to allow compiling on JDK7
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4948 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 736994b..2faf787 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -776,9 +776,8 @@
// close() closes the socket, thus waking up the RFB thread.
public void close() {
shuttingDown = true;
- sock.shutdown();
try {
- sock.close();
+ sock.shutdown();
} catch (java.lang.Exception e) {
throw new Exception(e.toString());
}
diff --git a/java/com/tigervnc/vncviewer/F8Menu.java b/java/com/tigervnc/vncviewer/F8Menu.java
index ca09ac2..317caf3 100644
--- a/java/com/tigervnc/vncviewer/F8Menu.java
+++ b/java/com/tigervnc/vncviewer/F8Menu.java
@@ -85,7 +85,7 @@
public void actionPerformed(ActionEvent ev) {
if (actionMatch(ev, exit)) {
- cc.close();
+ cc.deleteWindow();
} else if (actionMatch(ev, fullScreen)) {
cc.toggleFullScreen();
} else if (actionMatch(ev, restore)) {