Author: mhutch
Date: 2006-11-14 08:44:15 -0500 (Tue, 14 Nov 2006)
New Revision: 67842
Modified:
trunk/monodevelop/Extras/AspNetEdit/AspNetEdit.Integration/ToolboxProvider.cs
trunk/monodevelop/Extras/AspNetEdit/Makefile.am
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
Log:
Use correct data directory and remove a writeline.
Modified:
trunk/monodevelop/Extras/AspNetEdit/AspNetEdit.Integration/ToolboxProvider.cs
===================================================================
---
trunk/monodevelop/Extras/AspNetEdit/AspNetEdit.Integration/ToolboxProvider.cs
2006-11-14 13:26:50 UTC (rev 67841)
+++
trunk/monodevelop/Extras/AspNetEdit/AspNetEdit.Integration/ToolboxProvider.cs
2006-11-14 13:44:15 UTC (rev 67842)
@@ -43,7 +43,7 @@
public IList<ItemToolboxNode> GetItems ()
{
- string dataDir = Path.Combine (Path.GetDirectoryName
(typeof(ToolboxProvider).Assembly.Location), "data");
+ string dataDir = Path.GetDirectoryName
(typeof(ToolboxProvider).Assembly.Location);
string file = Path.Combine (dataDir,
"WebControlsToolbox.xml");
if (!File.Exists (file)) {
IdeApp.Services.MessageService.ShowWarning
("Could not find data file \""+file+"\"");
Modified: trunk/monodevelop/Extras/AspNetEdit/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/AspNetEdit/Makefile.am 2006-11-14 13:26:50 UTC
(rev 67841)
+++ trunk/monodevelop/Extras/AspNetEdit/Makefile.am 2006-11-14 13:44:15 UTC
(rev 67842)
@@ -99,8 +99,8 @@
$(RES:%=/resource:%) $(build_sources)
$(DATA_FILE_BUILD): $(srcdir)/data/$(notdir $@)
- mkdir -p $(ADDIN_BUILD)/data
- cp $(srcdir)/data/$(notdir $@) $(ADDIN_BUILD)/data/.
+ mkdir -p $(ADDIN_BUILD)
+ cp $(srcdir)/data/$(notdir $@) $(ADDIN_BUILD)/.
if ENABLE_ASPNETEDIT
aspneteditlibdir = $(MD_ADDIN_DIR)/AspNetEdit
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
2006-11-14 13:26:50 UTC (rev 67841)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
2006-11-14 13:44:15 UTC (rev 67842)
@@ -84,7 +84,7 @@
IToolboxDynamicProvider dyProv = item as
IToolboxDynamicProvider;
if (dyProv != null)
dynamicProviders.Add
((IToolboxDynamicProvider) item);
- System.Console.WriteLine("Addin default
items");;
+
IToolboxDefaultProvider defProv = item as
IToolboxDefaultProvider;
if (defProv!= null) {
IList<ItemToolboxNode> newItems =
defProv.GetItems ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
