From 5fc0587f6d7839eb356965a72a472f82e788e4c9 Mon Sep 17 00:00:00 2001
From: Pawel Piech <pawel.piech@windriver.com>
Date: Thu, 1 Mar 2012 22:12:40 -0800
Subject: [PATCH] Bug 373040 - [breakpoints] Breakpoint Types submenu in editor
 ruler popup doesn't work.

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

diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 3ea7d3effc0..ad4689c8b8d 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -415,13 +415,6 @@
       <viewerContribution
             targetID="#CEditorRulerContext"
             id="org.eclipse.cdt.debug.ui.CEditorRulerActions">
-         <action
-               label="%BreakpointTypes.label"
-               class="org.eclipse.debug.ui.actions.RulerBreakpointTypesActionDelegate"
-               id="org.eclipse.cdt.debug.ui.breakpointTypesAction"
-               menubarPath="debug"
-               style="pulldown">
-         </action>
          <action
                label="%BreakpointProperties.label"
                helpContextId="breakpoint_properties_action_context"
@@ -1201,6 +1194,8 @@
                  
                </and>
                <and>
+               <instanceof value="org.eclipse.cdt.debug.internal.ui.breakpoints.CBreakpointContext">
+               </instanceof>
                   <test property="org.eclipse.cdt.debug.ui.createBreakpointAdapt" value="org.eclipse.cdt.debug.core.model.ICBreakpoint" />
                   <not>   
                      <test property="org.eclipse.cdt.debug.ui.createBreakpointAdapt" value="org.eclipse.cdt.debug.core.model.ICTracepoint"/>
@@ -1759,6 +1754,18 @@
           </visibleWhen>
        </command>
     </menuContribution>    
+    <menuContribution
+          locationURI="popup:#CEditorRulerContext?after=debug">
+    <menu 
+         id="breakpointTypes" 
+    	 label="%BreakpointTypes.label">
+       <dynamic
+           id="org.eclipse.debug.ui.actions.BreakpointTypesContribution"
+           class="org.eclipse.debug.ui.actions.BreakpointTypesContribution">
+       </dynamic>
+    </menu>         
+    </menuContribution>    
+          
    </extension>
    <extension
          point="org.eclipse.core.runtime.adapters">