diff options
| author | Marius Nita <marius@cs.pdx.edu> | 2002-11-06 13:57:54 +0000 |
|---|---|---|
| committer | Marius Nita <marius@cs.pdx.edu> | 2002-11-06 13:57:54 +0000 |
| commit | 37be3ef9249b452b8edec25a441aefff80c2d4b8 (patch) | |
| tree | 5c1f8e7f0135b99fa1adb708c9046d440021af90 /src/blackbox.cc | |
| parent | 35fcb62ddd4861f857d93941407e3d87d444b2cc (diff) | |
omg, fat commit
pulled the style crap out of screen, i think the reconfigure case needs to be handled still.
moved util and config into otk, changed everything else accordingly.
code compiles and runs
Diffstat (limited to 'src/blackbox.cc')
| -rw-r--r-- | src/blackbox.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/blackbox.cc b/src/blackbox.cc index 0b509655..5f07e37f 100644 --- a/src/blackbox.cc +++ b/src/blackbox.cc @@ -80,7 +80,7 @@ using std::string; #include "otk/image.hh" #include "otk/assassin.hh" #include "screen.hh" -#include "util.hh" +#include "otk/util.hh" #include "bbwindow.hh" #include "workspace.hh" @@ -102,12 +102,12 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc) argv = m_argv; // try to make sure the ~/.openbox directory exists - mkdir(expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC | + mkdir(otk::expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH); if (! rc) rc = "~/.openbox/rc3"; - rc_file = expandTilde(rc); + rc_file = otk::expandTilde(rc); config.setFile(rc_file); no_focus = False; @@ -1062,7 +1062,7 @@ void Blackbox::load_rc(void) { else if (resource.colors_per_channel > 6) resource.colors_per_channel = 6; if (config.getValue("session.styleFile", s)) - resource.style_file = expandTilde(s); + resource.style_file = otk::expandTilde(s); else resource.style_file = DEFAULTSTYLE; |