Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / settings.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/settings.cpp b/synfig-studio/trunk/src/synfigapp/settings.cpp
index 53d3179..c3b3810 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/settings.cpp
+++ b/synfig-studio/trunk/src/synfigapp/settings.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file template.cpp
+/*!    \file settings.cpp
 **     \brief Template File
 **
-**     $Id: settings.cpp,v 1.2 2005/01/12 04:08:32 darco Exp $
+**     $Id$
 **
 **     \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;
                        }
                }