* static method 'mergePath' is now normal method 'merge'

[simple-launcher] / gconf-wrapper.cc

diff --git a/gconf-wrapper.cc b/gconf-wrapper.cc
index 6b48775..cad3e04 100644 (file)
--- a/gconf-wrapper.cc
+++ b/gconf-wrapper.cc
@@ -20,10 +20,10 @@
 GConfClient *GConfItem::ourClient = NULL;
 
 GConfItem::GConfItem() {
-  validateClient();
+  allocateClient();
 }
 
-void GConfItem::validateClient() {
+void GConfItem::allocateClient() {
   if (ourClient == NULL) {
     ourClient = gconf_client_get_default();
   }
@@ -32,6 +32,21 @@ void GConfItem::validateClient() {
 GConfKey::GConfKey(const std::string& path): myKeyPath(path) {
 }
 
+std::string GConfKey::merge(const std::string& path) const {
+  std::string result = myKeyPath;
+
+  if (path.empty()) {
+    // this is actually a bad situation, what to do??
+  } else if (path[0] == '/') {
+    result.append(path);
+  } else {
+    result.append("/");
+    result.append(path);
+  }
+
+  return result;
+}
+
 GConfStringValue::GConfStringValue(const GConfKey& key, const std::string& name, const std::string& defaultValue):
   GConfOption(key, name),
   myDefaultValue(defaultValue) {