From 34ec558456d268e1d5c93ae8f71498abc60092bd Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 31 May 2010 10:51:00 +0400 Subject: [PATCH] Fix xfce templates --- .../claws-mail-3.7/.claws-mail/accountrc.tmpl | 6 +++--- .../.config/xfce4/desktop/icons.screen0.rc | 8 ++++---- .../cldx-10.2-10.4/.config/xfce4/panel/panels.xml | 12 ++++++------ .../40-xfce/xfce-4.6/.config/mousepad/mousepadrc | 2 +- .../xfce-4.6/.config/xfce4/desktop/icons.screen0.rc | 8 ++++---- .../40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml | 12 ++++++------ desktop/user/40-xfce/xfce-4.6/Desktop/Disks.desktop | 2 +- desktop/user/40-xfce/xfce-4.6/Desktop/FTP.desktop | 2 +- desktop/user/40-xfce/xfce-4.6/Desktop/Home.desktop | 8 ++++---- .../.config/xfce4/desktop/icons.screen0.rc | 4 ++-- .../xfce-always/.config/xfce4/panel/panels.xml | 4 ++-- desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop | 2 +- .../40-xfce/xfce-always/Desktop/FTP.desktop.remove | 2 +- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/desktop/user/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl b/desktop/user/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl index 91f4dda..fc96cf2 100644 --- a/desktop/user/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl +++ b/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 diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc b/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc index 195a478..395001d 100644 --- a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc +++ b/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# diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml b/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml index c5af380..93b49d3 100644 --- a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml +++ b/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml @@ -17,16 +17,16 @@ -#?cl_remote_host!=# +#?env(client.os_remote_auth)!=# -#cl_remote_host# -#?cl_remote_host!=&&cl_remote_ftp!=# +#env# +#?env(client.os_remote_auth)!=&&server(ftp.host)!=# -#cl_remote_host# -#?cl_remote_host==# +#env# +#?env(client.os_remote_auth)==# -#cl_remote_host# +#env# diff --git a/desktop/user/40-xfce/xfce-4.6/.config/mousepad/mousepadrc b/desktop/user/40-xfce/xfce-4.6/.config/mousepad/mousepadrc index 5c68e99..9faa90e 100644 --- a/desktop/user/40-xfce/xfce-4.6/.config/mousepad/mousepadrc +++ b/desktop/user/40-xfce/xfce-4.6/.config/mousepad/mousepadrc @@ -5,4 +5,4 @@ Droid Sans Mono 10 0 0 0 -0 \ No newline at end of file +0 diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc b/desktop/user/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc index f9cded1..395001d 100644 --- a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc +++ b/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# diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml b/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml index ebd69bf..0a6de01 100644 --- a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml +++ b/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml @@ -17,16 +17,16 @@ -#?cl_remote_host!=# +#?env(client.os_remote_auth)!=# -#cl_remote_host# -#?cl_remote_host!=&&cl_remote_ftp!=# +#env# +#?env(client.os_remote_auth)!=&&server(ftp.host)!=# -#cl_remote_host# -#?cl_remote_host==# +#env# +#?env(client.os_remote_auth)==# -#cl_remote_host# +#env# diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/Disks.desktop b/desktop/user/40-xfce/xfce-4.6/Desktop/Disks.desktop index 8e8c267..384945c 100644 --- a/desktop/user/40-xfce/xfce-4.6/Desktop/Disks.desktop +++ b/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 diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/FTP.desktop b/desktop/user/40-xfce/xfce-4.6/Desktop/FTP.desktop index 6f6ada3..e87251d 100644 --- a/desktop/user/40-xfce/xfce-4.6/Desktop/FTP.desktop +++ b/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 diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/Home.desktop b/desktop/user/40-xfce/xfce-4.6/Desktop/Home.desktop index b0e6faf..9618092 100644 --- a/desktop/user/40-xfce/xfce-4.6/Desktop/Home.desktop +++ b/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 diff --git a/desktop/user/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc b/desktop/user/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc index b88680c..3fab42d 100644 --- a/desktop/user/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc +++ b/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# diff --git a/desktop/user/40-xfce/xfce-always/.config/xfce4/panel/panels.xml b/desktop/user/40-xfce/xfce-always/.config/xfce4/panel/panels.xml index 1d03369..f497354 100644 --- a/desktop/user/40-xfce/xfce-always/.config/xfce4/panel/panels.xml +++ b/desktop/user/40-xfce/xfce-always/.config/xfce4/panel/panels.xml @@ -7,9 +7,9 @@ -#?env(client.cl_remote_ftp)!=# +#?server(ftp.host)!=# -#env# +#server# diff --git a/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop b/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop index 513700f..0de7b57 100644 --- a/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop +++ b/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 diff --git a/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop.remove b/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop.remove index 45ca288..03c88d0 100644 --- a/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop.remove +++ b/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)==