diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-11 07:41:22 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-11 07:41:22 (GMT) |
commit | 9f2f65a698c4cc71373a7fe9d73a0889e0d3487b (patch) | |
tree | 4ad67db771d73ea3c48f80a1244037fc9754edd2 /src/fluxbox.cc | |
parent | 1f01d84c080d607a91eb417efcaf5e500b5f1d7e (diff) | |
download | fluxbox_pavel-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.zip fluxbox_pavel-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.tar.bz2 |
make FbTk::Command a template class, split parsing information out of ObjectRegistry
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 5a6db71..2ebf931 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -263,7 +263,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
263 | // Because when the command is executed we shouldn't do reconfig directly | 263 | // Because when the command is executed we shouldn't do reconfig directly |
264 | // because it could affect ongoing menu stuff so we need to reconfig in | 264 | // because it could affect ongoing menu stuff so we need to reconfig in |
265 | // the next event "round". | 265 | // the next event "round". |
266 | FbTk::RefCount<FbTk::Command> reconfig_cmd(new FbTk::SimpleCommand<Fluxbox>(*this, &Fluxbox::timed_reconfigure)); | 266 | FbTk::RefCount<FbTk::Command<void> > reconfig_cmd(new FbTk::SimpleCommand<Fluxbox>(*this, &Fluxbox::timed_reconfigure)); |
267 | timeval to; | 267 | timeval to; |
268 | to.tv_sec = 0; | 268 | to.tv_sec = 0; |
269 | to.tv_usec = 1; | 269 | to.tv_usec = 1; |
@@ -1034,7 +1034,7 @@ void Fluxbox::handleSignal(int signum) { | |||
1034 | break; | 1034 | break; |
1035 | default: | 1035 | default: |
1036 | fprintf(stderr, | 1036 | fprintf(stderr, |
1037 | _FB_CONSOLETEXT(BaseDisplay, SignalCaught, "%s: signal %d caught\n", "signal catch debug message. Include %s for command and %d for signal number").c_str(), | 1037 | _FB_CONSOLETEXT(BaseDisplay, SignalCaught, "%s: signal %d caught\n", "signal catch debug message. Include %s for Command<void> and %d for signal number").c_str(), |
1038 | m_argv[0], signum); | 1038 | m_argv[0], signum); |
1039 | 1039 | ||
1040 | if (! m_starting && ! re_enter) { | 1040 | if (! m_starting && ! re_enter) { |