3 files changed, 12 insertions, 4 deletions

diff --git a/etc/profile-a-l/filezilla.profile b/etc/profile-a-l/filezilla.profile
index 6c7ab8f0d..43e877fd0 100644
--- a/etc/profile-a-l/filezilla.profile
+++ b/etc/profile-a-l/filezilla.profile
@@ -8,6 +8,7 @@ include globals.local
 
 noblacklist ${HOME}/.config/filezilla
 noblacklist ${HOME}/.filezilla
+noblacklist ${HOME}/.ssh
 
 # Allow python (blacklisted by disable-interpreters.inc)
 include allow-python2.inc
diff --git a/etc/profile-a-l/gnome-todo.profile b/etc/profile-a-l/gnome-todo.profile
index 2fab3dcc7..5bef96ae7 100644
--- a/etc/profile-a-l/gnome-todo.profile
+++ b/etc/profile-a-l/gnome-todo.profile
@@ -53,8 +53,8 @@ dbus-user filter
 dbus-user.own org.gnome.Todo
 dbus-user.talk ca.desrt.dconf
 #dbus-user.talk org.gnome.evolution.dataserver.AddressBook9
-#dbus-user.talk org.gnome.evolution.dataserver.Calendar8
-#dbus-user.talk org.gnome.evolution.dataserver.Sources5
+dbus-user.talk org.gnome.evolution.dataserver.Calendar8
+dbus-user.talk org.gnome.evolution.dataserver.Sources5
 #dbus-user.talk org.gnome.evolution.dataserver.Subprocess.Backend.*
 #dbus-user.talk org.gnome.OnlineAccounts
 dbus-system none
diff --git a/etc/profile-a-l/linphone.profile b/etc/profile-a-l/linphone.profile
index dc156b298..c509122e2 100644
--- a/etc/profile-a-l/linphone.profile
+++ b/etc/profile-a-l/linphone.profile
@@ -6,8 +6,10 @@ include linphone.local
 # Persistent global definitions
 include globals.local
 
+noblacklist ${HOME}/.config/linphone
 noblacklist ${HOME}/.linphone-history.db
 noblacklist ${HOME}/.linphonerc
+noblacklist ${HOME}/.local/share/linphone
 
 include disable-common.inc
 include disable-devel.inc
@@ -16,10 +18,15 @@ include disable-interpreters.inc
 include disable-passwdmgr.inc
 include disable-programs.inc
 
-mkfile ${HOME}/.linphone-history.db
-mkfile ${HOME}/.linphonerc
+# linphone 4.0 (released 2017-06-26) moved config and database files to respect
+# freedesktop standards. For backward compatibility we continue to whitelist
+# ${HOME}/.linphone-history.db and ${HOME}/.linphonerc but no longer mkfile.
+mkdir ${HOME}/.config/linphone
+mkdir ${HOME}/.local/share/linphone
+whitelist ${HOME}/.config/linphone
 whitelist ${HOME}/.linphone-history.db
 whitelist ${HOME}/.linphonerc
+whitelist ${HOME}/.local/share/linphone
 whitelist ${DOWNLOADS}
 include whitelist-common.inc