# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1265827300 28800
# Node ID f095ed39206dd5c98c1d2448b893be1b98dd1f9e
# Parent  71bbda100c421065e8aa252df99a662af2d8ebe9# Parent  d496880b1e8b104b793d0b6d7539d729b9ce1a85
Heads were merged

diff -r d496880b1e8b -r f095ed39206d org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF	Tue Feb 09 18:33:04 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF	Wed Feb 10 10:41:40 2010 -0800
@@ -22,7 +22,7 @@
  org.eclipse.wst.sse.ui;bundle-version="1.1.100",
  org.eclipse.wst.sse.core;bundle-version="1.1.400",
  org.eclipse.wst.html.core;bundle-version="1.1.300",
- org.eclipse.wst.jsdt.core;bundle-version="1.0.201"
+ org.eclipse.wst.jsdt.core;bundle-version="1.0.200"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff -r d496880b1e8b -r f095ed39206d org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Tue Feb 09 18:33:04 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Wed Feb 10 10:41:40 2010 -0800
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
 
 import org.eclipse.core.net.proxy.IProxyData;
@@ -40,13 +39,11 @@
 				if (resourceUrl != null) {
 					try {
 						URL fileUrl = FileLocator.toFileURL(resourceUrl);
-						File file = new File(fileUrl.toURI());
+						File file = new File(fileUrl.getPath());
 						System.setProperty(XUL_RUNNER_PATH_PARAMETER, file
 								.getAbsolutePath()); //$NON-NLS-1$
 					} catch (IOException e) {
-						// log the exception
-					} catch (URISyntaxException e) {
-						// log the exception
+						PreviewerPlugin.log(e);
 					}
 				}
 			}
diff -r d496880b1e8b -r f095ed39206d org.symbian.tools.wrttools.product/plugin.xml
--- a/org.symbian.tools.wrttools.product/plugin.xml	Tue Feb 09 18:33:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/plugin.xml	Wed Feb 10 10:41:40 2010 -0800
@@ -91,6 +91,10 @@
             activityId="org.symbian.tools.wrttools.product.wtp"
             pattern="org\.eclipse\.wst\.jsdt\.web\.ui/org\.eclipse\.wst\.jsdt\.internal\.web\.ui\.convertProjects">
       </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.symbian.tools.wrttools.product.wtp"
+            pattern="org\.eclipse\.debug\.ui/org\.eclipse\.debug\.ui\.contextualLaunch\.profile\.submenu">
+      </activityPatternBinding>
       <category
             description="WTP UI elements that are not compatible with WRT widget development"
             id="org.symbian.tools.wrttools.product.wtp"