From 6d0d4f988e46be75500f801f10891290479cc6e8 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Tue, 6 Apr 2004 22:15:25 +0000
Subject: [PATCH] fix clock visibility flag

svn path=/trunk/; revision=8994
---
 reactos/subsys/system/explorer/doxy-footer.html       | 2 +-
 reactos/subsys/system/explorer/taskbar/traynotify.cpp | 7 +++++--
 reactos/subsys/system/explorer/utility/xmlstorage.cpp | 7 +------
 reactos/subsys/system/explorer/utility/xmlstorage.h   | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/reactos/subsys/system/explorer/doxy-footer.html b/reactos/subsys/system/explorer/doxy-footer.html
index e9dcac1212c..85339d0cf5d 100644
--- a/reactos/subsys/system/explorer/doxy-footer.html
+++ b/reactos/subsys/system/explorer/doxy-footer.html
@@ -3,7 +3,7 @@
   <tr>
     <td><address style="align: right;"><small>
 ROS Explorer Source Code Documentation
-<br>generated on 04.04.2004 by <a href="http://www.doxygen.org/index.html">
+<br>generated on 05.04.2004 by <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border=0>
 	</small></address>
 	</td>
diff --git a/reactos/subsys/system/explorer/taskbar/traynotify.cpp b/reactos/subsys/system/explorer/taskbar/traynotify.cpp
index a97ddcd2ccd..199806992ce 100644
--- a/reactos/subsys/system/explorer/taskbar/traynotify.cpp
+++ b/reactos/subsys/system/explorer/taskbar/traynotify.cpp
@@ -209,6 +209,8 @@ static bool get_hide_clock_from_registry()
 
 void NotifyArea::read_config()
 {
+	bool clock_visible = true;
+
 	 // read notification icon settings from XML configuration
 	XMLPos pos = g_Globals.get_cfg();
 
@@ -217,8 +219,7 @@ void NotifyArea::read_config()
 #endif
 	{
 		if (pos.go_down("desktopbar")) {
-			bool show = XMLBoolRef(pos, "options", "show-clock", !get_hide_clock_from_registry());
-			show_clock(show);
+			clock_visible = XMLBoolRef(pos, "options", "show-clock", !get_hide_clock_from_registry());
 			pos.back();
 		}
 	}
@@ -252,6 +253,8 @@ void NotifyArea::read_config()
 
 		pos.back();
 	}
+
+	show_clock(clock_visible);
 }
 
 void NotifyArea::write_config()
diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.cpp b/reactos/subsys/system/explorer/utility/xmlstorage.cpp
index 05e9de6cb96..e8d970555d1 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.cpp
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.cpp
@@ -151,13 +151,8 @@ void XMLCALL XMLReader::XML_EndElementHandler(void* userData, const XML_Char* na
 	if (p != s)
 		pThis->_pos->append_content(s, p-s);
 
-	std::string leading;
-
 	if (p != e)
-		leading.assign(p, e-p);
-
-	if (leading.empty())
-		pThis->_pos->_end_leading = leading;
+		pThis->_pos->_end_leading.assign(p, e-p);
 
 	pThis->_pos.back();
 
diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.h b/reactos/subsys/system/explorer/utility/xmlstorage.h
index 91c29d10d7a..5c9e9de3dff 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.h
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.h
@@ -587,7 +587,7 @@ protected:
 	void append_trailing(const char* s, int l)
 	{
 		if (_children.empty())
-			_trailing.append(s, l);
+			_content.append(s, l);
 		else
 			_children.back()->_trailing.append(s, l);
 	}