diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-01-02 16:29:27 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-01-02 16:29:27 +0400 |
| commit | c1ee09f0217e56b30c672bec2f76a55ff85449ba (patch) | |
| tree | b90ac1bbd0e40093b30ae05c8062eb661cb24e6f /extras/MonoDevelop.AddinAuthoring | |
| parent | 795e73c6c1cafc5898afeac022aa520974675888 (diff) | |
| parent | 45132db7a43b404c9075a85a7754915c43648278 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
Diffstat (limited to 'extras/MonoDevelop.AddinAuthoring')
3 files changed, 3 insertions, 3 deletions
diff --git a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionNodeBuilder.cs b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionNodeBuilder.cs index c5c2fa6fdc..4095a15a48 100644 --- a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionNodeBuilder.cs +++ b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionNodeBuilder.cs @@ -64,7 +64,7 @@ namespace MonoDevelop.AddinAuthoring.NodeBuilders public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, ref string label, ref Pixbuf icon, ref Pixbuf closedIcon) { Extension ext = (Extension) dataObject; - label = Util.GetDisplayName (ext); + label = EscapeTextForMarkup (Util.GetDisplayName (ext)); icon = Context.GetIcon ("md-extension"); } diff --git a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionPointNodeBuilder.cs b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionPointNodeBuilder.cs index 76446829e1..2e7cfa5693 100644 --- a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionPointNodeBuilder.cs +++ b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/ExtensionPointNodeBuilder.cs @@ -71,7 +71,7 @@ namespace MonoDevelop.AddinAuthoring.NodeBuilders public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, ref string label, ref Pixbuf icon, ref Pixbuf closedIcon) { ExtensionPoint ep = (ExtensionPoint) dataObject; - label = !string.IsNullOrEmpty (ep.Name) ? ep.Name : ep.Path; + label = EscapeTextForMarkup (!string.IsNullOrEmpty (ep.Name) ? ep.Name : ep.Path); icon = Context.GetIcon ("md-extension-point"); } diff --git a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/SolutionNodeBuilder.cs b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/SolutionNodeBuilder.cs index 0df58e778f..0382b13032 100644 --- a/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/SolutionNodeBuilder.cs +++ b/extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.NodeBuilders/SolutionNodeBuilder.cs @@ -71,7 +71,7 @@ namespace MonoDevelop.AddinAuthoring.NodeBuilders public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, ref string label, ref Gdk.Pixbuf icon, ref Gdk.Pixbuf closedIcon) { Solution sol = (Solution) dataObject; - label = sol.Name; + label = EscapeTextForMarkup (sol.Name); icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Solution); } |