From bc25cdb9a5ac7795a9e09d522fa28bdc5209a165 Mon Sep 17 00:00:00 2001
From: Ken Ryall <ken.ryall@nokia.com>
Date: Fri, 11 May 2007 05:31:02 +0000
Subject: [PATCH] Reworked previous change for 179340.

---
 .../org/eclipse/cdt/internal/ui/CPerspectiveFactory.java   | 7 +------
 debug/org.eclipse.cdt.debug.ui/plugin.xml                  | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java
index c5b9431a2d2..42b4416545a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java
@@ -8,13 +8,11 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     QNX Software System
- *     Ken Ryall (Nokia) - Bug 179340 add breakpoint actions to C++ perspective
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui;
 
 import org.eclipse.cdt.internal.ui.wizards.CWizardRegistry;
 import org.eclipse.cdt.ui.CUIPlugin;
-
 import org.eclipse.search.ui.NewSearchUI;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
@@ -70,10 +68,7 @@ public class CPerspectiveFactory implements IPerspectiveFactory {
 		// link - things we should do
 		layout.addShowInPart(CUIPlugin.CVIEW_ID);
 		layout.addShowInPart(IPageLayout.ID_RES_NAV);
-
-		// Add in the breakpoint action set, these are commonly used even if not debugging yet.
-		layout.addActionSet("org.eclipse.debug.ui.breakpointActionSet"); //$NON-NLS-1$
-
+		
 		addCWizardShortcuts(layout);
 	}
 	
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index c2534d39d57..7bad516555f 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -39,6 +39,12 @@
    </extension>
    <extension
          point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="org.eclipse.cdt.ui.CPerspective">
+         <actionSet
+               id="org.eclipse.debug.ui.breakpointActionSet">
+         </actionSet>
+      </perspectiveExtension>
       <perspectiveExtension
             targetID="org.eclipse.debug.ui.DebugPerspective">
          <view