From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 29 Apr 2008 22:47:53 +0000 (-0000)
Subject: 2008-04-30  Marek Habersack  <mhabersack@novell.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=832187b02554d791b85e0d35cce2060da6574187;p=mono.git

2008-04-30  Marek Habersack  <mhabersack@novell.com>

	* ConfigurationElement.cs: HasLocalModifications considers a
	property modifed locally if its origin is SetHere and it's been
	marked as modified.

svn path=/trunk/mcs/; revision=102162
---

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index f19c3103d6a..d6ea09c97d7 100644
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-30  Marek Habersack  <mhabersack@novell.com>
+
+	* ConfigurationElement.cs: HasLocalModifications considers a
+	property modifed locally if its origin is SetHere and it's been
+	marked as modified.
+
 2008-03-20  Igor Zelmanovich  <igorz@mainsoft.com>
 
 	* Configuration.cs:
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
index 56fb151d9f0..6dfabd15da4 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs
@@ -286,7 +286,7 @@ namespace System.Configuration
 		internal virtual bool HasLocalModifications ()
 		{
 			foreach (PropertyInformation pi in ElementInformation.Properties)
-				if (pi.ValueOrigin == PropertyValueOrigin.SetHere)
+				if (pi.ValueOrigin == PropertyValueOrigin.SetHere && pi.IsModified)
 					return true;
 			
 			return false;