From 4b1b3f592aa4308bce6f7448ead5322fb3b269f7 Mon Sep 17 00:00:00 2001
From: akir <akir>
Date: Thu, 2 Sep 2004 08:58:06 +0000
Subject: allow blank lines in apps-file fixed wrong mapping of [TOP] <->
 getNormalLayer()

---
 src/Remember.cc | 10 ++++++----
 1 file 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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Remember.cc,v 1.39 2004/08/10 18:35:05 fluxgen Exp $
+// $Id: Remember.cc,v 1.40 2004/09/02 08:58:06 akir Exp $
 
 #include "Remember.hh"
 #include "ClientPattern.hh"
@@ -291,8 +291,10 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
             }
 
             row++;
-            if (line[0] == '#')
-                continue;  //the line is commented
+            FbTk::StringUtil::removeFirstWhitespace(line);
+            FbTk::StringUtil::removeTrailingWhitespace(line);
+            if (line.size() == 0 || line[0] == '#')
+                continue;  //the line is commented or blank
             int parse_pos = 0, err = 0;
             string str_key, str_option, str_label;
             err = FbTk::StringUtil::getStringBetween(str_key, 
@@ -333,7 +335,7 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
                 } else if (str_label == "NORMAL") {
                     l = Fluxbox::instance()->getNormalLayer();
                 } else if (str_label == "TOP") {
-                    l = Fluxbox::instance()->getNormalLayer();
+                    l = Fluxbox::instance()->getTopLayer();
                 } else if (str_label == "DOCK") {
                     l = Fluxbox::instance()->getDockLayer();
                 } else if (str_label == "ABOVEDOCK") {
-- 
cgit v0.11.2