Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/src/core/MonoDevelop.Ide/ChangeLog5
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs7
2 files changed, 10 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index e794285c11..978098757c 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-12 Michael Hutchinson <mhutchinson@novell.com>
+
+ * MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs: Escape
+ markup to fix GTK errors and list misrendering.
+
2009-10-12 Mike Krüger <mkrueger@novell.com>
* MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs:
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
index afd0042b6a..550613dc00 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -184,9 +184,12 @@ namespace MonoDevelop.Ide.CodeTemplates
}
if (treeviewCodeTemplates.Selection.IterIsSelected (iter)) {
- templateCellRenderer.Markup = template.Shortcut + " (" + GettextCatalog.GetString (template.Description) + ")";
+ templateCellRenderer.Markup = GLib.Markup.EscapeText (template.Shortcut) + " (" +
+ GLib.Markup.EscapeText (GettextCatalog.GetString (template.Description)) + ")";
} else {
- templateCellRenderer.Markup = template.Shortcut + " <span foreground=\"" + GetColorString (Style.Text (StateType.Insensitive)) + "\">(" + GettextCatalog.GetString (template.Description) + ")</span>";
+ templateCellRenderer.Markup = GLib.Markup.EscapeText (template.Shortcut) + " <span foreground=\"" +
+ GetColorString (Style.Text (StateType.Insensitive)) + "\">("
+ + GLib.Markup.EscapeText (GettextCatalog.GetString (template.Description)) + ")</span>";
}
}