dont reconfigure during startup. thats a waste and screws up stuff!

[chaz/openbox] / src / Configuration.hh

diff --git a/src/Configuration.hh b/src/Configuration.hh
index 6909c7993f497075f6f8ad1e7480fa398339c1c2..b26541fd97cd0a5b760373b24845aea75cb3cafc 100644 (file)
--- a/src/Configuration.hh
+++ b/src/Configuration.hh
@@ -37,8 +37,8 @@
  */
 class Configuration {
 public:
-  explicit Configuration(const std::string &file);
-  Configuration();
+  explicit Configuration(const std::string &file, bool autosave = True);
+  Configuration(bool autosave = True);
   virtual ~Configuration();
 
   inline const std::string &file() const {
@@ -58,6 +58,7 @@ public:
 
   void save();
   bool load();
+  bool merge(const std::string &file, bool overwrite = False);
   void create();
 
   void setValue(const std::string &rname, bool value);