### Eclipse Workspace Patch 1.0
#P org.eclipse.ui.browser
Index: plugin.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.browser/plugin.xml,v
retrieving revision 1.25
diff -u -r1.25 plugin.xml
--- plugin.xml	15 Oct 2009 17:33:11 -0000	1.25
+++ plugin.xml	23 Oct 2009 21:54:17 -0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
+     Copyright (c) 2005, 2009 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
     
      Contributors:
          IBM Corporation - initial API and implementation
+     Martin Oberhuber (Wind River) - [292882] Default Browser on Solaris
  -->
 
 <plugin>
@@ -88,6 +89,7 @@
          executable="mozilla"
          factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
          <location>usr/bin/mozilla</location>
+         <location>usr/sfw/lib/mozilla/mozilla</location>
          <location>usr/X11/bin/mozilla</location>
       </browser>
       <browser
Index: src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java,v
retrieving revision 1.20
diff -u -r1.20 WebBrowserUtil.java
--- src/org/eclipse/ui/internal/browser/WebBrowserUtil.java	21 Oct 2009 15:51:35 -0000	1.20
+++ src/org/eclipse/ui/internal/browser/WebBrowserUtil.java	23 Oct 2009 21:54:18 -0000
@@ -7,7 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
- * Martin Oberhuber (Wind River) - [288140] allow default web browser on Solaris 
+ * Martin Oberhuber (Wind River) - [292882] Default Browser on Solaris
  *******************************************************************************/
 package org.eclipse.ui.internal.browser;
 
@@ -16,16 +16,18 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.program.Program;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
 /**
  * Utility class for the Web browser tools.
  */
@@ -152,9 +154,23 @@
 	}
 
 	public static boolean canUseSystemBrowser() {
-		// Disabling system browser on Solaris due to bug 94497
-		if (Platform.OS_SOLARIS.equals(Platform.getOS()) && !Platform.WS_GTK.equals(Platform.getWS()))
-			return false;
+		// Disabling system browser on Solaris < Solaris10 due to bug 94497
+		// The problem is that the SWT Program fails with the Tooltalk / DT integration on Solaris 9 or older
+		// The GTK / Gnome integration on Solaris 10 or newer does work though.
+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94497#c56
+		if (Platform.OS_SOLARIS.equals(Platform.getOS())) {
+			//No system browser on Solaris Motif
+			if (!Platform.WS_GTK.equals(Platform.getWS())) {
+				return false;
+			}
+			//No system browser on Solaris 9 or older
+			String osVersion = WebBrowserUIPlugin.getInstance().getBundle().getBundleContext().getProperty(Constants.FRAMEWORK_OS_VERSION);
+			int compareVal = new Version(osVersion).compareTo(new Version(5,10,0));
+			if (compareVal < 0) {
+				//older than Solaris 10
+				return false;
+			}
+		}
 		return Program.findProgram("html") != null; //$NON-NLS-1$
 	}