Index: trunk/ChameleonPrefPane/Sources/string_util.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/string_util.h	(revision 430)
+++ trunk/ChameleonPrefPane/Sources/string_util.h	(revision 431)
@@ -79,6 +79,17 @@
 	return trim_left( trim_right( src , substr) , substr );
 } 
 
+/**
+ * trim the space chars (or any substring) on the left of a string
+ */
+inline std::string string_left( const std::string& source, const std::string& substr = " ")
+{
+	std::string str = source;
+	std::string::size_type pos = source.find_first_of(substr);
+	return pos!=std::string::npos ? str.erase(source.find_first_of(substr) ) : str;
+}
+
+
 inline char HexToDec(char nibble) { nibble = toupper(nibble); return (nibble < 'A') ? nibble - '0' : nibble - 'A' +10;}
 
 #endif
Index: trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm	(revision 430)
+++ trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm	(revision 431)
@@ -292,7 +292,7 @@
 		{
 			std::string contentValue = trim(
 			[ [(NSTextField*) bod->contentID stringValue] UTF8String ]);
-			kernelFlags.removeFlag(kernelFlags.stringFromKey(bod->Name));
+			kernelFlags.removeFlag(bod->Name);
 			if(val && contentValue.length()>0)
 			{
 				std::string concat = trim(name);
Index: trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp	(revision 430)
+++ trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp	(revision 431)
@@ -59,17 +59,28 @@
 // remove a flag in the string
 void KernOptionsParser::removeFlag(const std::string& flag)
 {
-	std::string::size_type found = _options.find(flag);
+	if (flag.length()==0) return; // not a flag, bye
+	std::string::size_type pos, l = _options.length();	
+	if (l==0) return; // empty options nothing to do	
+	std::string f = string_left(flag, "=");
+	std::string::size_type found = _options.find(f);
 	if (found==std::string::npos) return;
-	_options.erase(found, found+flag.length());
+	// find the end of the flag
+	for ( pos=found+flag.length(); pos<l && _options[pos]!=' '; pos++);
+	_options.erase(found, pos);
 	_options = trim(_options);
 }
 
 // remove a flag in the string
 void KernOptionsParser::addFlag(const std::string& flag)
 {
-	std::string::size_type found = _options.find(flag);
-	if (found!=std::string::npos) return;
+	// finding a flag can be tricky as some have a variable part of the form:
+	// flag=value and what we want is to keep identify them while they will varyà
+	std::string key= string_left(flag,"=");
+	
+	std::string::size_type found = _options.find(key);
+	if (found!=std::string::npos) 
+		removeFlag(key);
 	_options = " " + _options;
 	_options = flag + _options;
 	_options = trim(_options);
Index: trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj
===================================================================
--- trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj	(revision 430)
+++ trunk/ChameleonPrefPane/ChameleonPrefPane.xcodeproj/project.pbxproj	(revision 431)
@@ -875,8 +875,10 @@
 				GCC_ENABLE_OBJC_GC = supported;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_PROFILING_CODE = YES;
 				INSTALL_PATH = "~/Library/PreferencePanes";
 				ONLY_ACTIVE_ARCH = YES;
+				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx10.6;
 				VALID_ARCHS = "i386 x86_64";
 			};