using a Screen reference instead of pointer in Workspace

[chaz/openbox] / src / Resource.cc

diff --git a/src/Resource.cc b/src/Resource.cc
index ec29ac9ada4d224dc86b4314687ce95f84dff75c..1f6f84380528ff2ddbb2bdc6f6b0c1f839504e17 100644 (file)
--- a/src/Resource.cc
+++ b/src/Resource.cc
@@ -35,17 +35,27 @@
 
 #include <assert.h>
 
+bool obResource::m_initialized = false;
+
 obResource::obResource(const std::string &file) {
   setFile(file);
   m_modified = false;
   m_database = NULL;
   m_autosave = true;
+  if (!m_initialized) {
+    XrmInitialize();
+    m_initialized = true;
+  }
 }
 
 obResource::obResource() {
   m_modified = false;
   m_database = NULL;
   m_autosave = true;
+  if (!m_initialized) {
+    XrmInitialize();
+    m_initialized = true;
+  }
 }
 
 obResource::~obResource() {
@@ -88,6 +98,10 @@ void obResource::setValue(const std::string &rname, bool value) {
     save();
 }
 
+void obResource::setValue(const std::string &rname, int value) {
+  setValue(rname, (long)value);
+}
+
 void obResource::setValue(const std::string &rname, long value) {
   assert(m_database != NULL);