From 829315385fddb4605acf949f4e31d82c74325c9c Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Fri, 27 Feb 2015 14:19:59 -0600
Subject: GUI: Use valid XML syntax

Safer handling:
& --> &amp;
> --> &gt;
< --> &lt;

Broken tags:
</function>      --> </action>
<folders="1"...> --> <filter folders="1"...>

Change-Id: Iaddaf9db163e08250cb4deefdfdb814c589ccb47
---
 gui/devices/watch/res/watch.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'gui/devices/watch/res/watch.xml')

diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index dfbed16cd..a86b07c62 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -382,9 +382,9 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=wipe</action>
 					<action function="set">tw_action2_param=dalvik</action>
-					<action function="set">tw_text1=Wipe Cache & Dalvik?</action>
-					<action function="set">tw_action_text1=Wiping Cache & Dalvik...</action>
-					<action function="set">tw_complete_text1=Cache & Dalvik Wipe Complete</action>
+					<action function="set">tw_text1=Wipe Cache &amp; Dalvik?</action>
+					<action function="set">tw_action_text1=Wiping Cache &amp; Dalvik...</action>
+					<action function="set">tw_complete_text1=Cache &amp; Dalvik Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
 					<action function="page">confirm_action</action>
 				</actions>
@@ -762,12 +762,12 @@
 
 		<page name="rebootcheck">
 			<object type="action">
-				<condition var1="tw_backup_system_size" op=">=" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&gt;=" var2="%tw_min_system%" />
 				<action function="reboot">%tw_action_param%</action>
 			</object>
 
 			<object type="action">
-				<condition var1="tw_backup_system_size" op="<" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&lt;" var2="%tw_min_system%" />
 				<action function="page">confirm_action</action>
 			</object>
 		</page>
@@ -1008,7 +1008,7 @@
 
 			<object type="action">
 				<condition var1="tw_confirm_formatdata" op="!=" var2="yes" />
-				<action function="page">formatdata</function>
+				<action function="page">formatdata</action>
 			</object>
 		</page>
 
@@ -1442,11 +1442,11 @@
 		<page name="backupname1">
 			<object type="action">
 				<condition var1="tw_backup_name" op="=" var2="(Auto Generate)" />
-				<action function="generatebackupname"></function>
+				<action function="generatebackupname"></action>
 			</object>
 
 			<object type="action">
-				<action function="page">backupname2</function>
+				<action function="page">backupname2</action>
 			</object>
 		</page>
 
@@ -1811,7 +1811,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -1901,7 +1901,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -1949,7 +1949,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
 					<action function="set">tw_text1=Rename Backup?</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Renaming Backup...</action>
@@ -2826,7 +2826,7 @@
 			<object type="fileselector">
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
 				<text>%tw_file_location1%</text>
-				<folders="1" files="1" />
+				<filter folders="1" files="1" />
 				<path name="tw_file_location1" default="/" />
 				<data name="tw_filename1" />
 				<selection name="tw_selection1" />
@@ -2899,7 +2899,7 @@
 				<placement x="%col1_x%" y="%row2_y%" />
 				<text>Copy Folder</text>
 				<actions>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && cp -R</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; cp -R</action>
 					<action function="set">tw_fm_text1=Copying</action>
 					<action function="page">choosedestinationfolder</action>
 				</actions>
@@ -2975,7 +2975,7 @@
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && mv</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; mv</action>
 					<action function="page">filemanagerrenamefolder</action>
 				</actions>
 			</object>
@@ -2998,7 +2998,7 @@
 
 			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
-				<text>Browse to Destination & Press Select</text>
+				<text>Browse to Destination &amp; Press Select</text>
 			</object>
 
 			<object type="fileselector">
-- 
cgit v1.2.3