X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=fcdc9d974c5240acb2bdb24faf11f8fbdaec6f67;hb=ec7cc30e6ed3955adabba46e519ebd1d6fd281bb;hp=671b0025fc12ce32909c694925d61336084711f3;hpb=0a4cb2647316bda42e94ee37607f93f731552b37;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 671b002..fcdc9d9 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -57,7 +57,7 @@ public class Platform {
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
-            if (os_name.startsWith("Darwin")) platform_class = "Carbon";
+            if (os_name.startsWith("Darwin")) platform_class = "Darwin";
             else if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
                 else platform_class = "X11";
@@ -211,7 +211,15 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     protected InputStream _getBuiltinInputStream() {
-	return new ByteArrayInputStream(org.bouncycastle.util.encoders.Base64.decode(org.xwt.Builtin.encoded));
+	try {
+	    return new FileInputStream("builtin.xwar");
+	    /*
+	    return new ByteArrayInputStream(org.bouncycastle.util.encoders.Base64.decode(org.xwt.Builtin.encoded));
+	    */
+	} catch (Exception e) {
+	    Log.log(this, e);
+	    return null;
+	}
     }
 
     /** returns the value of the environment variable key, or null if no such key exists */