aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakir <akir>2004-09-02 08:58:06 (GMT)
committerakir <akir>2004-09-02 08:58:06 (GMT)
commit4b1b3f592aa4308bce6f7448ead5322fb3b269f7 (patch)
tree6c013fd8737ec28ad77a0c596d5f02b26e441ff6
parent39e88f3f6f83d78458cc755f717826d89f965750 (diff)
downloadfluxbox-4b1b3f592aa4308bce6f7448ead5322fb3b269f7.zip
fluxbox-4b1b3f592aa4308bce6f7448ead5322fb3b269f7.tar.bz2
allow blank lines in apps-file
fixed wrong mapping of [TOP] <-> getNormalLayer()
-rw-r--r--src/Remember.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Remember.cc b/src/Remember.cc
index 74e6ce6..47528af 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -21,7 +21,7 @@
21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
22// DEALINGS IN THE SOFTWARE. 22// DEALINGS IN THE SOFTWARE.
23 23
24// $Id: Remember.cc,v 1.39 2004/08/10 18:35:05 fluxgen Exp $ 24// $Id: Remember.cc,v 1.40 2004/09/02 08:58:06 akir Exp $
25 25
26#include "Remember.hh" 26#include "Remember.hh"
27#include "ClientPattern.hh" 27#include "ClientPattern.hh"
@@ -291,8 +291,10 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
291 } 291 }
292 292
293 row++; 293 row++;
294 if (line[0] == '#') 294 FbTk::StringUtil::removeFirstWhitespace(line);
295 continue; //the line is commented 295 FbTk::StringUtil::removeTrailingWhitespace(line);
296 if (line.size() == 0 || line[0] == '#')
297 continue; //the line is commented or blank
296 int parse_pos = 0, err = 0; 298 int parse_pos = 0, err = 0;
297 string str_key, str_option, str_label; 299 string str_key, str_option, str_label;
298 err = FbTk::StringUtil::getStringBetween(str_key, 300 err = FbTk::StringUtil::getStringBetween(str_key,
@@ -333,7 +335,7 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
333 } else if (str_label == "NORMAL") { 335 } else if (str_label == "NORMAL") {
334 l = Fluxbox::instance()->getNormalLayer(); 336 l = Fluxbox::instance()->getNormalLayer();
335 } else if (str_label == "TOP") { 337 } else if (str_label == "TOP") {
336 l = Fluxbox::instance()->getNormalLayer(); 338 l = Fluxbox::instance()->getTopLayer();
337 } else if (str_label == "DOCK") { 339 } else if (str_label == "DOCK") {
338 l = Fluxbox::instance()->getDockLayer(); 340 l = Fluxbox::instance()->getDockLayer();
339 } else if (str_label == "ABOVEDOCK") { 341 } else if (str_label == "ABOVEDOCK") {