commit 00937a09141a098654ecf9f4b92d570c0cc28795
author Pierre Ossman <ossman@cendio.se> Sat Jul 11 14:55:15 2015 +0200
committer Pierre Ossman <ossman@cendio.se> Sat Jul 11 14:55:15 2015 +0200
tree 10ff461afc44af8dc747b8c92188cf693ce9642d
parent 09a8b533d9b7792436ebb11c927c5d57b6e62346
parent 52889840658f1a91a0f43bce7917e0b85c985f3e

Merge branch 'translation' of https://github.com/CendioOssman/tigervnc

java/com/tigervnc/vncviewer/CConn.java

diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 9342051..ec52f6e 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -781,7 +781,7 @@
       Attributes attributes = manifest.getMainAttributes();
       pkgDate = attributes.getValue("Package-Date");
       pkgTime = attributes.getValue("Package-Time");
-    } catch (IOException e) { }
+    } catch (java.lang.Exception e) { }
 
     Window fullScreenWindow = Viewport.getFullScreenWindow();
     if (fullScreenWindow != null)

java/com/tigervnc/vncviewer/VncViewer.java

diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java
index 1e0f223..cc21c2e 100644
--- a/java/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/com/tigervnc/vncviewer/VncViewer.java
@@ -365,7 +365,7 @@
         build = attributes.getValue("Build");
         buildDate = attributes.getValue("Package-Date");
         buildTime = attributes.getValue("Package-Time");
-      } catch (java.io.IOException e) { }
+      } catch (java.lang.Exception e) { }
     }
   }