From 84765391c8c77e6db2b83fbc6dc6842e9debf9a7 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Wed, 16 Jan 2002 17:36:45 +0000
Subject: [PATCH] r1097: Converter for old-format config files now stops if the
 file looks like XML (probably from a failed conversion).

---
 ROX-Filer/Help/Changes      | 5 +++++
 ROX-Filer/Help/TODO         | 2 ++
 ROX-Filer/src/gui_support.c | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index 3b4e70ed..2b99bd27 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,11 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+16-Jan-2001
+~~~~~~~~~~~
+Converter for old-format config files now stops if the file looks like
+XML (probably from a failed conversion).
+
 13-Jan-2001
 ~~~~~~~~~~~
 Fixed some compile problems on Solaris (Andreas Dehmel).
diff --git a/ROX-Filer/Help/TODO b/ROX-Filer/Help/TODO
index 0ac0431e..8cf24b12 100644
--- a/ROX-Filer/Help/TODO
+++ b/ROX-Filer/Help/TODO
@@ -45,6 +45,8 @@ Panel sometimes won't accept drops:
 
 FEATURES FOR 1.3
 
+Allow command-line arguments for executation pinboard/panel icons.
+
 Opening an AVFS directory with left-click should reuse the same window.
 
 Allow subdirectories inside SendTo, shown as submenus.
diff --git a/ROX-Filer/src/gui_support.c b/ROX-Filer/src/gui_support.c
index d5b6d390..f99c5eda 100644
--- a/ROX-Filer/src/gui_support.c
+++ b/ROX-Filer/src/gui_support.c
@@ -486,6 +486,14 @@ void parse_file(char *path, ParseFunc *parse_line)
 		char *line = data;
 		int  line_number = 1;
 
+		if (strncmp(data, "<?xml ", 6) == 0)
+		{
+			delayed_error(_("Attempt to read an XML file as "
+					"a text file. File '%s' may be "
+					"corrupted."), path);
+			return;
+		}
+
 		while (line && *line)
 		{
 			eol = strchr(line, '\n');
-- 
2.11.4.GIT