From 2d0762f05ff304b2d229915e5d20ae9e435e8003 Mon Sep 17 00:00:00 2001
From: Tomas Touceda <chiiph@leap.se>
Date: Wed, 8 May 2013 16:43:57 -0300
Subject: Fix key for dict, and make couch_url a property

---
 src/leap/soledad/__init__.py       |  2 +-
 src/leap/soledad/backends/couch.py | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/leap/soledad')

diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py
index b87dbbb6..1ef18174 100644
--- a/src/leap/soledad/__init__.py
+++ b/src/leap/soledad/__init__.py
@@ -245,7 +245,7 @@ class Soledad(object):
                     'database.')
                 self._set_symkey(
                     self._crypto.decrypt_sym(
-                        doc.content[self.KEY_SYMKEY],
+                        doc.content[self.SYMKEY_KEY],
                         passphrase=self._passphrase))
         # Stage 2 - Keys synchronization
         self._assert_keys_in_shared_db()
diff --git a/src/leap/soledad/backends/couch.py b/src/leap/soledad/backends/couch.py
index a7b43e82..93279e2e 100644
--- a/src/leap/soledad/backends/couch.py
+++ b/src/leap/soledad/backends/couch.py
@@ -460,3 +460,22 @@ class CouchServerState(ServerState):
         @type dbname: str
         """
         CouchDatabase.delete_database(self._couch_url + '/' + dbname)
+
+    def _set_couch_url(self, url):
+        """
+        Set the couchdb URL
+
+        @param url: CouchDB URL
+        @type url: str
+        """
+        self._couch_url = url
+
+    def _get_couch_url(self):
+        """
+        Return CouchDB URL
+
+        @rtype: str
+        """
+        return self._couch_url
+
+    couch_url = property(_get_couch_url, _set_couch_url, doc='CouchDB URL')
-- 
cgit v1.2.3