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/EditTemplateDialog.cs8
2 files changed, 9 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index c2fdb4c4ef..66d68a41fe 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03 Michael Hutchinson <mhutchinson@novell.com>
+
+ * MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs: Fix GTK
+ warnings.
+
2010-06-03 Lluis Sanchez Gual <lluis@novell.com>
* MonoDevelop.Components.Docking/DockFrame.cs:
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
index c9c9bc7e4c..eb8321f740 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
@@ -55,10 +55,10 @@ namespace MonoDevelop.Ide.CodeTemplates
this.Build();
this.Title = isNew ? GettextCatalog.GetString ("New template") : GettextCatalog.GetString ("Edit template");
this.template = template;
- this.entryShortcut1.Text = template.Shortcut;
- this.comboboxentryGroups.Entry.Text = template.Group;
- this.comboboxentryMime.Entry.Text = template.MimeType;
- this.entryDescription.Text = template.Description;
+ this.entryShortcut1.Text = template.Shortcut ?? "";
+ this.comboboxentryGroups.Entry.Text = template.Group ?? "";
+ this.comboboxentryMime.Entry.Text = template.MimeType ?? "";
+ this.entryDescription.Text = template.Description ?? "";
this.textEditor.Document.MimeType = template.MimeType;
this.textEditor.Document.Text = template.Code;