X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fsettings.cpp;h=c3b3810e149725443376d3f92af6bdf2186121c0;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=70be8bd7a0af51c3d5320cc8330d28da719638fa;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/settings.cpp b/synfig-studio/trunk/src/synfigapp/settings.cpp
index 70be8bd..c3b3810 100644
--- a/synfig-studio/trunk/src/synfigapp/settings.cpp
+++ b/synfig-studio/trunk/src/synfigapp/settings.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -31,9 +32,12 @@
 
 #include <fstream>
 #include <iostream>
+#include <algorithm>
 #include "settings.h"
 #include <synfig/general.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -129,6 +133,19 @@ Settings::set_value(const synfig::String& key,const synfig::String& value)
 	return true;
 }
 
+//! Compare two key names, putting pref.* keys first
+static bool
+compare_pref_first (synfig::String first, synfig::String second)
+{
+	return	first.substr(0, 5) == "pref."
+			?	second.substr(0, 5) == "pref."
+				?	first < second
+				:	true
+			:	second.substr(0, 5) == "pref."
+				?	false
+				:	first < second;
+}
+
 Settings::KeyList
 Settings::get_key_list()const
 {
@@ -154,7 +171,10 @@ Settings::get_key_list()const
 	}
 
 	// Sort the keys
-	key_list.sort();
+	// We make sure the 'pref.*' keys come first to fix bug 1694393,
+	// where windows were being created before the parameter
+	// specifying which window manager hint to use had been loaded
+	key_list.sort(compare_pref_first);
 
 	return key_list;
 }
@@ -178,7 +198,8 @@ Settings::save_to_file(const synfig::String& filename)const
 			for(iter=key_list.begin();iter!=key_list.end();++iter)
 			{
 				if(!file)return false;
-				file<<*iter<<'='<<get_value(*iter)<<endl;
+				String ret = get_value(*iter);
+				if (ret != String()) file<<*iter<<'='<<(ret == "none" ? "normal" : ret)<<endl;
 			}
 		}
 
@@ -229,7 +250,7 @@ Settings::load_from_file(const synfig::String& filename)
 			}
 			catch(...)
 			{
-				synfig::error("Settings::load_from_file(): Attept to set key \"%s\" with a value of \"%s\" has thrown an exception.",key.c_str(),value.c_str());
+				synfig::error("Settings::load_from_file(): Attempt to set key \"%s\" with a value of \"%s\" has thrown an exception.",key.c_str(),value.c_str());
 				throw;
 			}
 		}