From 2b9a38cba5ddbe108aff7b0071bc21fbe53f8f39 Mon Sep 17 00:00:00 2001 From: Mathias Gumz <akira at fluxbox dot org> Date: Thu, 9 Sep 2010 15:33:34 +0200 Subject: minor cleanup --- src/FbCommands.cc | 5 +---- src/WindowState.cc | 6 +++++- src/fluxbox.cc | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/FbCommands.cc b/src/FbCommands.cc index 4b40f82..8683711 100644 --- a/src/FbCommands.cc +++ b/src/FbCommands.cc @@ -253,10 +253,7 @@ RestartFluxboxCmd::RestartFluxboxCmd(const string &cmd):m_cmd(cmd){ } void RestartFluxboxCmd::execute() { - if (m_cmd.empty()) - Fluxbox::instance()->restart(); - else - Fluxbox::instance()->restart(m_cmd.c_str()); + Fluxbox::instance()->restart(m_cmd.c_str()); } REGISTER_COMMAND(reconfigure, FbCommands::ReconfigureFluxboxCmd, void); diff --git a/src/WindowState.cc b/src/WindowState.cc index 1e650d8..b2c76b0 100644 --- a/src/WindowState.cc +++ b/src/WindowState.cc @@ -170,6 +170,8 @@ void SizeHints::reset(const XSizeHints &sizehint) { min_height = base_height; } +namespace { + void closestPointToAspect(unsigned int &ret_x, unsigned int &ret_y, unsigned int point_x, unsigned int point_y, unsigned int aspect_x, unsigned int aspect_y) { @@ -187,7 +189,9 @@ unsigned int increaseToMultiple(unsigned int val, unsigned int inc) { unsigned int decreaseToMultiple(unsigned int val, unsigned int inc) { return val % inc ? val - (val % inc) : val; } - + +} // end of anonymous namespace + /** * Changes width and height to the nearest (lower) value * that conforms to it's size hints. diff --git a/src/fluxbox.cc b/src/fluxbox.cc index d55029b..ea827f2 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -1216,7 +1216,7 @@ void Fluxbox::restart(const char *prog) { m_restarting = true; - if (prog) { + if (prog && *prog != '\0') { m_restart_argument = prog; } } -- cgit v0.11.2