[Monodevelop-patches-list] r1435 - in trunk/MonoDevelop/src: AddIns/DisplayBindings/SourceEditor AddIns/DisplayBindings/SourceEditor/Gui Main/Base Main/Base/Internal/Project/Project

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

Author: tberman
Date: 2004-04-10 23:10:44 -0400 (Sat, 10 Apr 2004)
New Revision: 1435

Modified:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
Log:
fix bug #56804 and a potential nullref


Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-04-10 18:39:59 UTC (rev 1434)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-04-11 03:10:44 UTC (rev 1435)
@@ -1,5 +1,9 @@
 2004-04-10  Todd Berman  <tberman at sevenl.net>
 
+	* Gui/SourceEditorView.cs: fix logic bug.
+
+2004-04-10  Todd Berman  <tberman at sevenl.net>
+
 	* CodeCompletion/CompletionWindow.cs: convert to RenderIcon and away
 	from stock-id, because of gtk+2.4 sizing issues.
 

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-04-10 18:39:59 UTC (rev 1434)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-04-11 03:10:44 UTC (rev 1435)
@@ -369,7 +369,7 @@
 		
 		void IndentLines (int y0, int y1)
 		{
-			string indent = InsertSpacesInsteadOfTabs ? "\t" : new string (' ', (int) TabsWidth);
+			string indent = InsertSpacesInsteadOfTabs ? new string (' ', (int) TabsWidth) : "\t";
 			
 			for (int l = y0; l <= y1; l ++)
 				Buffer.Insert (Buffer.GetIterAtLine (l), indent);

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-10 18:39:59 UTC (rev 1434)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-11 03:10:44 UTC (rev 1435)
@@ -1,5 +1,9 @@
 2004-04-10  Todd Berman  <tberman at sevenl.net>
 
+	* Internal/Project/Project/AbstractProject.cs: fix potentiall nullref
+
+2004-04-10  Todd Berman  <tberman at sevenl.net>
+
 	* Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
 	* Gui/Workbench/Layouts/SdiWorkspaceWindow.cs:
 	* Gui/IWorkbenchLayout.cs:

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-04-10 18:39:59 UTC (rev 1434)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-04-11 03:10:44 UTC (rev 1435)
@@ -176,6 +176,7 @@
 
 		public bool IsFileInProject(string filename)
 		{
+			if (filename == null) return false;
 			foreach (ProjectFile file in projectFiles) {
 				// WINDOWS DEPENDENCY:
 				if (file.Name.ToUpper() == filename.ToUpper()) {