Fix xfce templates

desktop/user/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl

@@ -16,11 +16,11 @@ email=#-ur_mail-#
 
 #you can use $DOMAIN here
 #the default organization is empty
-organization=#-ur_organization-#
+organization=#-server(mail.organization)-#
 
 #you can use $DOMAIN here 
 #the default is smtp.$DOMAIN
-smtpserver=#-sr_mail_send_host-#
+smtpserver=#-server(mail.send_host)-#
 
 #Whether to use smtp authentication
 #the default is 0 (no)
@@ -43,7 +43,7 @@ recvtype=3
 
 #you can use $DOMAIN here 
 #the default is {pop,imap}.$DOMAIN
-recvserver=#-sr_mail_host-#
+recvserver=#-server(mail.host)-#
 
 #you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here
 #default is $LOGIN

desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc

@@ -3,15 +3,15 @@
 row=0
 col=0
 
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 [Disks]
 row=0
 col=1
-#cl_remote_host#
+#env#
 
-#?cl_remote_host!=&&cl_remote_ftp!=#
+#?env(client.os_remote_auth)!=&&server(ftp.host)!=#
 [FTP]
 row=0
 col=2
-#cl_remote_host#
+#env#
 

desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml

@@ -17,16 +17,16 @@
 		</properties>
 		<items>
 			<item name="xfce4-menu" id="1"/>
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 			<item name="launcher" id="20"/>
 			<item name="launcher" id="21"/>
-#cl_remote_host#
-#?cl_remote_host!=&&cl_remote_ftp!=#
+#env#
+#?env(client.os_remote_auth)!=&&server(ftp.host)!=#
 			<item name="launcher" id="22"/>
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
 			<item name="launcher" id="23"/>
-#cl_remote_host#
+#env#
 			<item name="separator" id="50"/>
 			<item name="pager" id="3"/>
 			<item name="tasklist" id="5"/>

desktop/user/40-xfce/xfce-4.6/.config/mousepad/mousepadrc

@@ -5,4 +5,4 @@ Droid Sans Mono 10
 0
 0
 0
-0
+0

desktop/user/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc

@@ -3,15 +3,15 @@
 row=0
 col=0
 
-#?env(client.cl_remote_host)!=#
+#?env(client.os_remote_auth)!=#
 [Disks]
 row=0
 col=1
-#cl_remote_host#
+#env#
 
-#?env(client.cl_remote_host)!=&&env(client.cl_remote_ftp)!=#
+#?env(client.os_remote_auth)!=&&server(ftp.host)!=#
 [FTP]
 row=0
 col=2
-#cl_remote_host#
+#env#
 

desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml

@@ -17,16 +17,16 @@
 		</properties>
 		<items>
 			<item name="xfce4-menu" id="1"/>
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 			<item name="launcher" id="20"/>
 			<item name="launcher" id="21"/>
-#cl_remote_host#
-#?cl_remote_host!=&&cl_remote_ftp!=#
+#env#
+#?env(client.os_remote_auth)!=&&server(ftp.host)!=#
 			<item name="launcher" id="22"/>
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
 			<item name="launcher" id="23"/>
-#cl_remote_host#
+#env#
 			<item name="separator" id="50"/>
 			<item name="pager" id="3"/>
 			<item name="tasklist" id="5"/>

desktop/user/40-xfce/xfce-4.6/Desktop/Disks.desktop

@@ -1,4 +1,4 @@
-# Calculate format=samba cl_remote_host!=
+# Calculate format=samba env(client.os_remote_auth)!=
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8

desktop/user/40-xfce/xfce-4.6/Desktop/FTP.desktop

@@ -1,4 +1,4 @@
-# Calculate format=samba cl_remote_host!=&&cl_remote_ftp!=
+# Calculate format=samba env(client.os_remote_auth)!=&&server(ftp.host)!=
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8

desktop/user/40-xfce/xfce-4.6/Desktop/Home.desktop

@@ -6,12 +6,12 @@ Type=Application
 Name=Home
 Comment=Browser Home
 Categories=Application;
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 Exec=thunar /home/#-ur_login-#/Home
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
 Exec=thunar /home/#-ur_login-#
-#cl_remote_host#
+#env#
 Icon=user-home
 Terminal=false
 StartupNotify=false

desktop/user/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc

@@ -7,9 +7,9 @@ col=0
 row=0
 col=1
 
-#?env(client.cl_remote_ftp)!=#
+#?server(ftp.host)!=#
 [FTP]
 row=0
 col=2
-#env#
+#server#
 

desktop/user/40-xfce/xfce-always/.config/xfce4/panel/panels.xml

@@ -7,9 +7,9 @@
 			<item name="xfce4-menu" id="1"/>
 			<item name="launcher" id="20"/>
 			<item name="launcher" id="21"/>
-#?env(client.cl_remote_ftp)!=#
+#?server(ftp.host)!=#
 			<item name="launcher" id="22"/>
-#env#
+#server#
 			<item name="separator" id="50"/>
 			<item name="pager" id="3"/>
 			<item name="tasklist" id="5"/>

desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop

@@ -1,4 +1,4 @@
-# Calculate format=samba env(client.cl_remote_ftp)!=
+# Calculate format=samba server(ftp.host)!=
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8

desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop.remove

@@ -1 +1 @@
-# Calculate append=remove name=FTP.desktop env(client.cl_remote_ftp)==
+# Calculate append=remove name=FTP.desktop server(ftp.host)==