Attachment 23349 Details for Bug 94497 – 94497_o.e.ui.browser_patch2.txt

94497_o.e.ui.browser_patch2.txt

94497_o.e.ui.browser_patch2.txt (text/plain), 1.59 KB, created by Konrad Kolosowski

on 2005-06-16 13:42:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Konrad Kolosowski

Created: 2005-06-16 13:42:16 EDT

Size: 1.59 KB

patch

obsolete

>Index: src/org/eclipse/ui/internal/browser/BrowserManager.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserManager.java,v
>retrieving revision 1.7
>diff -u -r1.7 BrowserManager.java
>--- src/org/eclipse/ui/internal/browser/BrowserManager.java	3 Jun 2005 03:09:32 -0000	1.7
>+++ src/org/eclipse/ui/internal/browser/BrowserManager.java	16 Jun 2005 17:31:59 -0000
>@@ -95,7 +95,7 @@
> 				IMemento memento = XMLMemento.createReadRoot(reader);
> 				
> 				IMemento system = memento.getChild("system"); //$NON-NLS-1$
>-				if (system != null)
>+				if (system != null && WebBrowserUtil.canUseSystemBrowser())
> 					browsers.add(new SystemBrowserDescriptor());
> 				
> 				IMemento[] children = memento.getChildren("external"); //$NON-NLS-1$
>Index: src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java,v
>retrieving revision 1.13
>diff -u -r1.13 WebBrowserUtil.java
>--- src/org/eclipse/ui/internal/browser/WebBrowserUtil.java	15 Jun 2005 22:46:45 -0000	1.13
>+++ src/org/eclipse/ui/internal/browser/WebBrowserUtil.java	16 Jun 2005 17:31:59 -0000
>@@ -150,7 +150,7 @@
> 
> 	public static boolean canUseSystemBrowser() {
> 		// Disabling system browser on Solaris due to bug 94497
>-		if (Platform.getOS()==Platform.OS_SOLARIS)
>+		if (Platform.OS_SOLARIS.equals(Platform.getOS()))
> 			return false;
> 		return Program.findProgram("html") != null; //$NON-NLS-1$
> 	}

Actions: View

Attachments on bug 94497: 21056 | 21140 | 23258 | 23349