From c2f443c0a3f3fb6cb36c9b39d19fd56c94f7fe1d Mon Sep 17 00:00:00 2001
From: John Cortell <john.cortell@freescale.com>
Date: Tue, 23 Feb 2010 14:49:22 +0000
Subject: [PATCH] [303380] Breakpoint view's Watchpoint and Event Breakpoint
 action should be in the same place

---
 debug/org.eclipse.cdt.debug.ui/plugin.xml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 34e421d8d2b..8610a975c5f 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -497,18 +497,6 @@
                id="org.eclipse.cdt.debug.internal.ui.actions.CBreakpointPropertiesAction">
          </action>
       </objectContribution>
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.BreakpointView"
-            id="org.eclipse.cdt.debug.ui.breakpointview.popupMenu">
-         <action
-               class="org.eclipse.cdt.debug.internal.ui.actions.AddWatchpointActionDelegate"
-               helpContextId="add_watchpoint_action_context"
-               icon="icons/elcl16/watchpoint_co.gif"
-               id="org.eclipse.cdt.debug.ui.addWatchpoint"
-               label="%AddWatchpoint.label"
-               menubarPath="additions"
-               tooltip="%AddWatchpoint.tooltip"/>
-      </viewerContribution>
       <viewerContribution
             targetID="#ASMEditorRulerContext"
             id="org.eclipse.cdt.debug.ui.AsmEditorRulerActions">
@@ -1090,6 +1078,15 @@
                </pluginState>
             </enablement>
          </action>
+         <action
+               class="org.eclipse.cdt.debug.internal.ui.actions.AddWatchpointActionDelegate"
+               icon="icons/elcl16/watchpoint_co.gif"
+               id="org.eclipse.cdt.debug.ui.addWatchpoint"
+               label="%AddWatchpoint.label"
+               menubarPath="cDebugActions"
+               style="push"
+               helpContextId="add_watchpoint_action_context"
+               tooltip="%AddWatchpoint.tooltip"/>
          <action
                class="org.eclipse.cdt.debug.internal.ui.actions.AddEventBreakpointActionDelegate"
                icon="icons/obj16/eventbreakpoint_obj.gif"