Commit in reactos/subsys/system/explorer on MAIN
doxy-footer.html+1-11.43 -> 1.44
taskbar/traynotify.cpp+5-21.57 -> 1.58
utility/xmlstorage.cpp+1-61.6 -> 1.7
       /xmlstorage.h+1-11.12 -> 1.13
+8-10
4 modified files
fix clock visibility flag

reactos/subsys/system/explorer
doxy-footer.html 1.43 -> 1.44
diff -u -r1.43 -r1.44
--- doxy-footer.html	4 Apr 2004 16:04:33 -0000	1.43
+++ doxy-footer.html	6 Apr 2004 22:15:25 -0000	1.44
@@ -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>

reactos/subsys/system/explorer/taskbar
traynotify.cpp 1.57 -> 1.58
diff -u -r1.57 -r1.58
--- traynotify.cpp	5 Apr 2004 19:54:11 -0000	1.57
+++ traynotify.cpp	6 Apr 2004 22:15:25 -0000	1.58
@@ -209,6 +209,8 @@
 
 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 @@
 #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 @@
 
 		pos.back();
 	}
+
+	show_clock(clock_visible);
 }
 
 void NotifyArea::write_config()

reactos/subsys/system/explorer/utility
xmlstorage.cpp 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- xmlstorage.cpp	4 Apr 2004 16:04:34 -0000	1.6
+++ xmlstorage.cpp	6 Apr 2004 22:15:25 -0000	1.7
@@ -151,13 +151,8 @@
 	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();
 

reactos/subsys/system/explorer/utility
xmlstorage.h 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- xmlstorage.h	4 Apr 2004 20:23:51 -0000	1.12
+++ xmlstorage.h	6 Apr 2004 22:15:25 -0000	1.13
@@ -587,7 +587,7 @@
 	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);
 	}
CVSspam 0.2.8