Attachment 67855 Details for Bug 100622 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

patch (text/plain), 3.53 KB, created by Grant Gayed

on 2007-05-18 15:25:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Grant Gayed

Created: 2007-05-18 15:25:16 EDT

Size: 3.53 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java,v
>retrieving revision 1.12
>diff -u -r1.12 Cocoa.java
>--- Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java	11 May 2007 18:57:57 -0000	1.12
>+++ Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java	18 May 2007 19:17:48 -0000
>@@ -37,6 +37,7 @@
> public static final int C_NSWindow = Cocoa.objc_getClass("NSWindow"); //$NON-NLS-1$
> public static final int C_NSBitmapImageRep = Cocoa.objc_getClass("NSBitmapImageRep"); //$NON-NLS-1$
> public static final int C_NSImageView = Cocoa.objc_getClass("NSImageView"); //$NON-NLS-1$
>+public static final int C_WebPreferences = Cocoa.objc_getClass("WebPreferences"); //$NON-NLS-1$
> 
> /* Objective-C method selectors */
> public static final int S_absoluteString = Cocoa.sel_registerName("absoluteString"); //$NON-NLS-1$
>@@ -84,11 +85,13 @@
> public static final int S_setDownloadDelegate = Cocoa.sel_registerName("setDownloadDelegate:"); //$NON-NLS-1$
> public static final int S_setFrameLoadDelegate = Cocoa.sel_registerName("setFrameLoadDelegate:"); //$NON-NLS-1$
> public static final int S_setGroupName = Cocoa.sel_registerName("setGroupName:"); //$NON-NLS-1$
>+public static final int S_setJavaEnabled = Cocoa.sel_registerName("setJavaEnabled:"); //$NON-NLS-1$
> public static final int S_setPolicyDelegate = Cocoa.sel_registerName("setPolicyDelegate:"); //$NON-NLS-1$
> public static final int S_setResourceLoadDelegate = Cocoa.sel_registerName("setResourceLoadDelegate:"); //$NON-NLS-1$
> public static final int S_setStatusText = Cocoa.sel_registerName("setStatusText:"); //$NON-NLS-1$
> public static final int S_setUIDelegate = Cocoa.sel_registerName("setUIDelegate:"); //$NON-NLS-1$
> public static final int S_sharedHTTPCookieStorage = Cocoa.sel_registerName("sharedHTTPCookieStorage"); //$NON-NLS-1$
>+public static final int S_standardPreferences = Cocoa.sel_registerName("standardPreferences"); //$NON-NLS-1$
> public static final int S_stopLoading = Cocoa.sel_registerName("stopLoading:"); //$NON-NLS-1$
> public static final int S_stringByEvaluatingJavaScriptFromString = Cocoa.sel_registerName("stringByEvaluatingJavaScriptFromString:"); //$NON-NLS-1$
> public static final int S_takeStringURLFrom = Cocoa.sel_registerName("takeStringURLFrom:"); //$NON-NLS-1$
>Index: Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Safari.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Safari.java,v
>retrieving revision 1.8
>diff -u -r1.8 Safari.java
>--- Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Safari.java	11 May 2007 21:32:46 -0000	1.8
>+++ Eclipse SWT Browser/carbon/org/eclipse/swt/browser/Safari.java	18 May 2007 19:17:48 -0000
>@@ -39,6 +39,7 @@
> 	//TEMPORARY CODE
> //	boolean doit;
> 
>+	static boolean Initialized;
> 	static Callback Callback3, Callback7;
> 
> 	static final int MIN_SIZE = 16;
>@@ -249,6 +250,13 @@
> 
> 	// [webView setDownloadDelegate:delegate];
> 	Cocoa.objc_msgSend(webView, Cocoa.S_setDownloadDelegate, delegate);
>+
>+	if (!Initialized) {
>+		Initialized = true;
>+		/* disable applets */
>+		int preferences = Cocoa.objc_msgSend(Cocoa.C_WebPreferences, Cocoa.S_standardPreferences);
>+		Cocoa.objc_msgSend(preferences, Cocoa.S_setJavaEnabled, 0);
>+	}
> }
> 
> static int eventProc3(int nextHandler, int theEvent, int userData) {

Actions: View | Diff

Attachments on bug 100622: 67855