diff --git a/evoke/EvokeService.cpp b/evoke/EvokeService.cpp index bb3ffbf..6e7b9ee 100644 --- a/evoke/EvokeService.cpp +++ b/evoke/EvokeService.cpp @@ -42,7 +42,7 @@ static void resolve_path(const edelib::String& datadir, edelib::String& item, bo const char* i = item.c_str(); if(!edelib::file_exists(i) && have_datadir) { - item = edelib::build_filename("/", datadir.c_str(), i); + item = edelib::build_filename(datadir.c_str(), i); i = item.c_str(); if(!edelib::file_exists(i)) { // no file, send then empty diff --git a/evoke/Xsm.cpp b/evoke/Xsm.cpp index f0d5009..ff3732c 100644 --- a/evoke/Xsm.cpp +++ b/evoke/Xsm.cpp @@ -90,7 +90,7 @@ void Xsm::xresource_replace(void) { edelib::String home = edelib::dir_home(); // try to open ~/.Xdefaults; if failed, X Resource will not complain - edelib::String db_file = edelib::build_filename("/", home.c_str(), USER_XRESOURCE); + edelib::String db_file = edelib::build_filename(home.c_str(), USER_XRESOURCE); // initialize XResource manager XrmInitialize(); @@ -145,7 +145,7 @@ void Xsm::xresource_replace(void) { XrmPutLineResource(&db, tmp.c_str()); } - edelib::String tmp_db_file = edelib::build_filename("/", home.c_str(), USER_XRESOURCE_TMP); + edelib::String tmp_db_file = edelib::build_filename(home.c_str(), USER_XRESOURCE_TMP); /* * Try to merge existing ~/.Xdefaults (if present) with our changes. If there is existing @@ -158,7 +158,7 @@ void Xsm::xresource_replace(void) { //XrmSetDatabase(fl_display, db); XrmDestroyDatabase(db); if(status) { - edelib::String db_backup = edelib::build_filename("/", home.c_str(), USER_XRESOURCE_SAVED); + edelib::String db_backup = edelib::build_filename(home.c_str(), USER_XRESOURCE_SAVED); edelib::file_rename(db_file.c_str(), db_backup.c_str()); } @@ -169,8 +169,8 @@ void Xsm::xresource_undo(void) { edelib::String home, db_file_backup, db_file; home = edelib::dir_home(); - db_file_backup = edelib::build_filename("/", home.c_str(), USER_XRESOURCE_SAVED); - db_file = edelib::build_filename("/", home.c_str(), USER_XRESOURCE); + db_file_backup = edelib::build_filename(home.c_str(), USER_XRESOURCE_SAVED); + db_file = edelib::build_filename(home.c_str(), USER_XRESOURCE); /* * If we have backup, restore it; otherwise delete ~/.Xdefaults.