From a1fd54cfdf57dade5f972c10e4e5f6429de8e40b Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Tue, 12 Jun 2007 16:20:55 +0000
Subject: [PATCH] aircraft.nas, gui.nas: adapt loadxml for absolute paths, drop
 second fgcommand arg debug.nas, tutorial.nas: adapt for abs. paths fuel.nas:
 cleanup screen.nas: don't remove listeners -- that's done automatically by
 removind     the node in NasalSys.cxx xml.nas: minor documentation fix

---
 Nasal/aircraft.nas | 7 ++++---
 Nasal/debug.nas    | 2 +-
 Nasal/gui.nas      | 4 ++--
 Nasal/screen.nas   | 6 ++----
 Nasal/tutorial.nas | 2 +-
 Nasal/xml.nas      | 3 +--
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Nasal/aircraft.nas b/Nasal/aircraft.nas
index ca9fed1dc..789bf9282 100644
--- a/Nasal/aircraft.nas
+++ b/Nasal/aircraft.nas
@@ -542,7 +542,7 @@ var livery = {
 		foreach (var file; directory(getprop("/sim/fg-root") ~ "/" ~ me.dir)) {
 			if (substr(file, -4) != ".xml")
 				continue;
-			var n = props.Node.new({ filename : me.dir ~ file });
+			var n = props.Node.new({ filename : getprop("/sim/fg-root") ~ "/" ~ me.dir ~ file });
 			fgcommand("loadxml", n);
 			n = n.getNode("data");
 
@@ -713,6 +713,7 @@ var autotrim = {
 };
 
 
+
 # HUD control class to handle both HUD implementations
 # ==============================================================================
 #
@@ -763,8 +764,8 @@ var HUD = {
 			me.currentN = me.vis0N;
 		}
 	},
-	oldinit1 : func { fgcommand("hud-init", props.Node.new()) },
-	oldinit2 : func { fgcommand("hud-init2", props.Node.new()) },
+	oldinit1 : func { fgcommand("hud-init") },
+	oldinit2 : func { fgcommand("hud-init2") },
 	is_active : func { me.vis0N.getValue() or me.vis1N.getValue() },
 };
 
diff --git a/Nasal/debug.nas b/Nasal/debug.nas
index 38dace5c7..aa90256db 100644
--- a/Nasal/debug.nas
+++ b/Nasal/debug.nas
@@ -242,7 +242,7 @@ if (getprop("/sim/logging/priority") != "alert") {
 #
 var load_xml_nasal = func(file) {
 	var n = props.globals.getNode("/tmp/nasal", 1);
-	n.getNode("filename", 1).setValue(file);
+	n.getNode("filename", 1).setValue(getprop("/sim/fg-root") ~ "/" ~ file);
 	n.getNode("targetnode", 1).setValue(n.getPath());
 	if (n.getNode("module", 0) == nil) {
 		var basename = split(".", split("/", file)[-1])[0];
diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index 9871d88ea..7587b1ec1 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -191,7 +191,7 @@ Dialog = {
             me.close();
 
         me.prop.removeChildren();
-        fgcommand("loadxml", props.Node.new({"filename": me.path,
+        fgcommand("loadxml", props.Node.new({"filename": getprop("/sim/fg-root") ~ "/" ~ me.path,
                 "targetnode": me.prop.getPath()}));
         var n = me.prop.getNode("name");
         if (n == nil)
@@ -301,7 +301,7 @@ nextStyle = func {
         curr = 0;
     }
     setprop("/sim/gui/current-style", curr);
-    fgcommand("gui-redraw", props.Node.new());
+    fgcommand("gui-redraw");
 }
 
 
diff --git a/Nasal/screen.nas b/Nasal/screen.nas
index 5bcdf2fb0..c52520300 100644
--- a/Nasal/screen.nas
+++ b/Nasal/screen.nas
@@ -198,8 +198,7 @@ window = {
 
 var log = nil;
 
-var L = _setlistener("/sim/signals/nasal-dir-initialized", func {
-	removelistener(L);
+_setlistener("/sim/signals/nasal-dir-initialized", func {
 	setlistener("/sim/gui/current-style", func {
 		var theme = getprop("/sim/gui/current-style");
 		theme_font = getprop("/sim/gui/style[" ~ theme ~ "]/fonts/message-display/name");
@@ -255,8 +254,7 @@ var callsign = nil;
 var atclast = nil;
 var listener = {};
 
-var M = _setlistener("/sim/signals/nasal-dir-initialized", func {
-	removelistener(M);
+_setlistener("/sim/signals/nasal-dir-initialized", func {
 	# set /sim/screen/nomap=true to prevent default message mapping
 	var nomap = getprop("/sim/screen/nomap");
 	if (nomap != nil and nomap) {
diff --git a/Nasal/tutorial.nas b/Nasal/tutorial.nas
index 1b8d1e1f2..2d5613bbd 100644
--- a/Nasal/tutorial.nas
+++ b/Nasal/tutorial.nas
@@ -469,7 +469,7 @@ var dialog = func {
 var load = func(file, index = 0) {
 	props.globals.getNode("/sim/tutorials", 1).removeChild("tutorial", index);
 	fgcommand("loadxml", props.Node.new({
-		"filename": file,
+		"filename": getprop("/sim/fg-root") ~ "/" ~ file,
 		"targetnode": "/sim/tutorials/tutorial[" ~ index ~ "]/",
 	}));
 }
diff --git a/Nasal/xml.nas b/Nasal/xml.nas
index 64f300a51..0b7ded109 100644
--- a/Nasal/xml.nas
+++ b/Nasal/xml.nas
@@ -1,7 +1,6 @@
 # XML parser that allows to parse XML files that don't follow the FlightGear standard by
 # storing information in attributes, like the crappy Traffic Manager and AI definition
-# files. Currently only reading from a string is supported, and the XML 1.0 standard
-# isn't fully implemented.
+# files.The XML 1.0 standard isn't fully implemented.
 #
 # Synopsis:  xml.process_string(<xml-data:string>, <action:hash>);
 #            xml.process_file(<filepath>, <action:hash>);