[Monodevelop-patches-list] r2082 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-12-15 19:01:45 -0500 (Wed, 15 Dec 2004)
New Revision: 2082

Modified:
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs
Log:
2004-12-15  Sander Rijken  <sr+ximianbugs at d-90.nl>

	* Commands/CustomStringTagProvider.cs: Patch to have COMBINEDIR return
	the actual directory instead of the filename, COMBINEFILENAME already
	does that.



Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-15 06:58:29 UTC (rev 2081)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-16 00:01:45 UTC (rev 2082)
@@ -1,3 +1,9 @@
+2004-12-15  Sander Rijken  <sr+ximianbugs at d-90.nl>
+
+	* Commands/CustomStringTagProvider.cs: Patch to have COMBINEDIR return
+	the actual directory instead of the filename, COMBINEFILENAME already
+	does that.
+
 2004-12-14  John Luke  <john.luke at gmail.com>
 
 	* Gui/Dialogs/CommonAboutDialog.cs:

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs	2004-12-15 06:58:29 UTC (rev 2081)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs	2004-12-16 00:01:45 UTC (rev 2082)
@@ -128,7 +128,7 @@
 					break;
 				
 				case "COMBINEDIR":
-					return projectService.GetFileName(projectService.CurrentOpenCombine);
+					return Path.GetDirectoryName (projectService.GetFileName(projectService.CurrentOpenCombine));
 				case "COMBINEFILENAME":
 					try {
 						return Path.GetFileName(projectService.GetFileName(projectService.CurrentOpenCombine));