Fix patches. Start fix xfce

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)==

desktop/user/60-application/pidgin-2.6/.purple/accounts.xml

@@ -1,4 +1,4 @@
-# Calculate env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=
+# Calculate env(client.os_remote_auth)!=&&server(jabber.host)!=
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <account version='1.0'>
@@ -9,11 +9,11 @@
 		<settings>
 			<setting name='require_tls' type='bool'>1</setting>
 			<setting name='check-mail' type='bool'>0</setting>
-			<setting name='connect_server' type='string'>#-env(client.sr_jabber_host)-#</setting>
+			<setting name='connect_server' type='string'>#-server(jabber.host)-#</setting>
 			<setting name='old_ssl' type='bool'>1</setting>
 			<setting name='auth_plain_in_clear' type='bool'>1</setting>
 			<setting name='ft_proxies' type='string'> </setting>
-			<setting name='port' type='int'>#-env(client.sr_jabber_port)-#</setting>
+			<setting name='port' type='int'>#-server(jabber.port)-#</setting>
 			<setting name='custom_smileys' type='bool'>1</setting>
 		</settings>
 		<settings ui='gtk-gaim'>

desktop/user/80-patches/patch-2.1.16/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.16
+# Calculate append=skip ini(ver.patch)<2.1.16

desktop/user/80-patches/patch-2.1.17/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.17
+# Calculate append=skip ini(ver.patch)<2.1.17

desktop/user/80-patches/patch-2.1.19/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.19
+# Calculate append=skip ini(ver.patch)<2.1.19