summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-28 15:48:01 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-28 15:48:01 -0300
commit6a5d6a47599959de04c91ea719ec21a81c74f47c (patch)
tree59e8abb289a9dfe7450670040f6bad402829d61c /mail
parent10fe6b5e350f501dd04917c694521c93e8bfbd1c (diff)
parentdfd6756ba89a1b993837869d1e8199c93ae62200 (diff)
Merge remote-tracking branch 'ivan/feature/3574_use-dirspec-instead-of-xdg' into develop
Diffstat (limited to 'mail')
-rw-r--r--mail/changes/feature-3574_use-dirspec-instead-of-plain-xdg1
-rw-r--r--mail/src/leap/mail/imap/service/imap-server.tac5
2 files changed, 3 insertions, 3 deletions
diff --git a/mail/changes/feature-3574_use-dirspec-instead-of-plain-xdg b/mail/changes/feature-3574_use-dirspec-instead-of-plain-xdg
new file mode 100644
index 00000000..9bdc5071
--- /dev/null
+++ b/mail/changes/feature-3574_use-dirspec-instead-of-plain-xdg
@@ -0,0 +1 @@
+ o Use dirspec instead of plain xdg. Closes #3574.
diff --git a/mail/src/leap/mail/imap/service/imap-server.tac b/mail/src/leap/mail/imap/service/imap-server.tac
index 8638be29..da72caea 100644
--- a/mail/src/leap/mail/imap/service/imap-server.tac
+++ b/mail/src/leap/mail/imap/service/imap-server.tac
@@ -1,10 +1,9 @@
import ConfigParser
import os
-from xdg import BaseDirectory
-
from leap.soledad.client import Soledad
from leap.mail.imap.service import imap
+from leap.common.config import get_path_prefix
config = ConfigParser.ConfigParser()
@@ -34,7 +33,7 @@ def initialize_soledad_mailbox(user_uuid, soledad_pass, server_url,
:rtype: Soledad instance
"""
- base_config = BaseDirectory.xdg_config_home
+ base_config = get_path_prefix()
secret_path = os.path.join(
base_config, "leap", "soledad", "%s.secret" % user_uuid)