Use libicu to support unicode properly; migrated ConfigManager to UnicodeString

1 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/UserConfigBackendHome/UserConfigBackendHome.cpp b/src/modules/UserConfigBackendHome/UserConfigBackendHome.cpp
index 9f724e5..d47e03b 100644
--- a/src/modules/UserConfigBackendHome/UserConfigBackendHome.cpp
+++ b/src/modules/UserConfigBackendHome/UserConfigBackendHome.cpp
@@ -34,23 +34,23 @@ namespace UserConfigBackendHome {
 bool UserConfigBackendHome::handleConfigEntry(const Core::ConfigEntry &entry, bool /*handled*/) {
   if(entry[0].getKey().matches("UserManager")) {
     if(entry[1].getKey().matches("Skeleton")) {
-      if(entry[2].empty())
-        skeleton = entry[1][0];
+      if(entry[2].isEmpty())
+        skeleton = entry[1][0].extract();
     }
     else if(entry[1].getKey().matches("HomeDir")) {
-      if(entry[2].empty())
-        homeDir = entry[1][0];
+      if(entry[2].isEmpty())
+        homeDir = entry[1][0].extract();
     }
     else if(entry[1].getKey().matches("UserDirMode")) {
-      if(entry[2].empty()) {
-        if(entry[1][0].empty()) {
+      if(entry[2].isEmpty()) {
+        if(entry[1][0].isEmpty()) {
           dirMode = 0755;
         }
         else {
           char *endptr;
-          unsigned long val = std::strtoul(entry[1][0].c_str(), &endptr, 8);
+          unsigned long val = std::strtoul(entry[1][0].extract().c_str(), &endptr, 8);
           if(*endptr || val > 07777) {
-            application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: DirMode '%s'", entry[1][0].c_str());
+            application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: DirMode '%s'", entry[1][0].extract().c_str());
           }
           else {
             dirMode = val;
@@ -58,7 +58,7 @@ bool UserConfigBackendHome::handleConfigEntry(const Core::ConfigEntry &entry, bo
         }
       }
     }
-    else if(!entry[1].empty())
+    else if(!entry[1].isEmpty())
       return false;
 
     return true;