--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Fri Aug 07 15:24:40 2009 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Fri Aug 07 15:25:12 2009 -0500
@@ -25,24 +25,65 @@
 -->
 
 <!-- The following UI elements are from org.eclipse.cdt.launch -->
+ 
+      <activityPatternBinding
+            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.launch/org.eclipse.cdt.cdi.launch.localCLaunch">
+      </activityPatternBinding>
+
       <activityPatternBinding
             activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.launch/org.eclipse.cdt.launch.localCLaunch">
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.dsf.gdb/org.eclipse.cdt.dsf.gdb.launch.localCLaunch">
+      </activityPatternBinding>
+
+      <activityPatternBinding
+            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.dsf.gdb/org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch">
+      </activityPatternBinding>
+
+      <activityPatternBinding
+            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.postmortemLaunchType">
       </activityPatternBinding>
 
       <activityPatternBinding
             activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.launch/org.eclipse.cdt.launch.localAttachCLaunch">
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.attachLaunchType">
+      </activityPatternBinding>
+
+     <activityPatternBinding
+           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.launch.remote/org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
+      </activityPatternBinding>
+
+     <activityPatternBinding
+           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.examples.dsf.pda/org.eclipse.cdt.examples.dsf.pda.launchType">
       </activityPatternBinding>
 
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.launch/org.eclipse.cdt.launch.coreFileCLaunch">
+     <activityPatternBinding
+           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.localCShortcut">
       </activityPatternBinding>
 
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.launch/org.eclipse.cdt.debug.ui.localCShortcut">
+     <activityPatternBinding
+           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.applicationLaunchType">
+      </activityPatternBinding>
+
+     <activityPatternBinding
+           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.debug.gdbjtag.core/org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
       </activityPatternBinding>
 
 <!-- The following UI elements are from org.eclipse.cdt.debug.ui -->

--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java	Fri Aug 07 15:24:40 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java	Fri Aug 07 15:25:12 2009 -0500
@@ -16,7 +16,6 @@
 */
 package com.nokia.cdt.debug.cw.symbian.ui.executables;
 
-import org.eclipse.cdt.debug.core.executables.Executable;
 import org.eclipse.cdt.debug.core.executables.ISourceFileRemapping;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
 import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
@@ -34,13 +33,13 @@
 
 public class SymbianSourceFileRemapping implements ISourceFileRemapping {
 
-	public String remapSourceFile(Executable executable, String filePath) {
+	public String remapSourceFile(IPath executable, String filePath) {
 
 		String epocRoot = "";
-		String[] segs = executable.getPath().segments();
+		String[] segs = executable.segments();
 		for (int i = 0; i < segs.length; i++) {
 			if (segs[i].equalsIgnoreCase("epoc32"))
-				epocRoot = executable.getPath().removeLastSegments(segs.length - i).toOSString();				
+				epocRoot = executable.removeLastSegments(segs.length - i).toOSString();				
 		}
 		if (epocRoot.length() > 0)
 		{