From 27e9dfb7f7c130accf8ef0a1f0ca4ad83aaca4b0 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Wed, 2 Jun 2010 13:47:43 +0400
Subject: [PATCH] Fix evolution template. Fix gnome always
 .calculate_directory.

---
 .../evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml         | 2 +-
 desktop/user/30-gnome/gnome-always/.calculate_directory         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml b/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
index 6ab2e8d..ca15704 100644
--- a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
+++ b/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
@@ -17,7 +17,7 @@
 	<entry name="accounts" type="list" ltype="string">
 		<li type="string">
 			<stringvalue>&lt;?xml version=&quot;1.0&quot;?&gt;
-&lt;account name=&quot;IMAP&quot; uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#&quot; enabled=&quot;true&quot;&gt;&lt;identity&gt;&lt;name&gt;#-ur_fullname-#&lt;/name&gt;&lt;addr-spec&gt;#-ur_mail-#&lt;/addr-spec&gt;&lt;reply-to&gt;#-ur_mail-#&lt;/reply-to&gt;&lt;organization&gt;#-ur_organization-#&lt;/organization&gt;&lt;signature uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#&quot;/&gt;&lt;/identity&gt;&lt;source save-passwd=&quot;true&quot; keep-on-server=&quot;false&quot; auto-check=&quot;true&quot; auto-check-timeout=&quot;5&quot;&gt;&lt;url&gt;imap://#-ur_login-#@#-sr_mail_host-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all&lt;/url&gt;&lt;/source&gt;&lt;transport save-passwd=&quot;false&quot;&gt;&lt;url&gt;smtp://#-ur_login-#@#-sr_mail_host-#/;use_ssl=never&lt;/url&gt;&lt;/transport&gt;&lt;drafts-folder&gt;imap://#-ur_login-#@#-env(client.sr_mail_host)-#/Drafts&lt;/drafts-folder&gt;&lt;sent-folder&gt;imap://#-ur_login-#@#-env(client.sr_mail_host)-#/Sent&lt;/sent-folder&gt;&lt;auto-cc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-cc&gt;&lt;auto-bcc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-bcc&gt;&lt;receipt-policy policy=&quot;never&quot;/&gt;&lt;pgp encrypt-to-self=&quot;false&quot; always-trust=&quot;false&quot; always-sign=&quot;false&quot; no-imip-sign=&quot;false&quot;/&gt;&lt;smime sign-default=&quot;false&quot; encrypt-default=&quot;false&quot; encrypt-to-self=&quot;false&quot;/&gt;&lt;/account&gt;
+&lt;account name=&quot;IMAP&quot; uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#&quot; enabled=&quot;true&quot;&gt;&lt;identity&gt;&lt;name&gt;#-ur_fullname-#&lt;/name&gt;&lt;addr-spec&gt;#-ur_mail-#&lt;/addr-spec&gt;&lt;reply-to&gt;#-ur_mail-#&lt;/reply-to&gt;&lt;organization&gt;#-server(mail.organization)-#&lt;/organization&gt;&lt;signature uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#&quot;/&gt;&lt;/identity&gt;&lt;source save-passwd=&quot;true&quot; keep-on-server=&quot;false&quot; auto-check=&quot;true&quot; auto-check-timeout=&quot;5&quot;&gt;&lt;url&gt;imap://#-ur_login-#@#-server(mail.host)-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all&lt;/url&gt;&lt;/source&gt;&lt;transport save-passwd=&quot;false&quot;&gt;&lt;url&gt;smtp://#-ur_login-#@#-server(mail.host)-#/;use_ssl=never&lt;/url&gt;&lt;/transport&gt;&lt;drafts-folder&gt;imap://#-ur_login-#@#-server(mail.host)-#/Drafts&lt;/drafts-folder&gt;&lt;sent-folder&gt;imap://#-ur_login-#@#-server(mail.host)-#/Sent&lt;/sent-folder&gt;&lt;auto-cc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-cc&gt;&lt;auto-bcc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-bcc&gt;&lt;receipt-policy policy=&quot;never&quot;/&gt;&lt;pgp encrypt-to-self=&quot;false&quot; always-trust=&quot;false&quot; always-sign=&quot;false&quot; no-imip-sign=&quot;false&quot;/&gt;&lt;smime sign-default=&quot;false&quot; encrypt-default=&quot;false&quot; encrypt-to-self=&quot;false&quot;/&gt;&lt;/account&gt;
 </stringvalue>
 		</li>
 	</entry>
diff --git a/desktop/user/30-gnome/gnome-always/.calculate_directory b/desktop/user/30-gnome/gnome-always/.calculate_directory
index 0db1286..7b1f32f 100644
--- a/desktop/user/30-gnome/gnome-always/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-always/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&& env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-#
+# Calculate append=skip ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&&env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-#