maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deviceId: shared between peers 

This patch changes the attributes of the "deviceId" property so
that it is shared between peers. Creating new peers from a template
must take care to preserve an existing "deviceId" value (separate
patch).
This commit is contained in:
Patrick Ohly 2009-11-21 18:17:17 +01:00
parent 9b35062bb9
commit 50e8a7ca9d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/syncevo/SyncConfig.cpp
View File

@ -904,6 +904,7 @@ ConfigPropertyRegistry &SyncConfig::getRegistry()
// peer independent sync properties
syncPropLogDir.setSharing(ConfigProperty::SOURCE_SET_SHARING);
syncPropMaxLogDirs.setSharing(ConfigProperty::SOURCE_SET_SHARING);
syncPropDevID.setSharing(ConfigProperty::SOURCE_SET_SHARING);
initialized = true;
}

3
test/test-dbus.py
View File

@ -1301,6 +1301,7 @@ class TestMultipleConfigs(unittest.TestCase, DBusUtil):
self.setUpSession("foo")
self.session.SetConfig(True, False,
{ "" : { "defaultPeer" : "foobar_peer",
"deviceId" : "shared-device-identifier",
"syncURL": "http://scheduleworld" },
"source/calendar" : { "uri" : "cal3" },
"source/addressbook" : { "evolutionsource": "Personal",
@ -1313,6 +1314,7 @@ class TestMultipleConfigs(unittest.TestCase, DBusUtil):
self.setUpSession("bar")
config = self.session.GetConfig(False, utf8_strings=True)
self.failUnlessEqual(config[""]["defaultPeer"], "foobar_peer")
self.failUnlessEqual(config[""]["deviceId"], "shared-device-identifier")
self.failUnlessEqual(config["source/addressbook"]["evolutionsource"], "Personal")
self.session.SetConfig(True, False,
{ "" : { "syncURL": "http://funambol" },
@ -1347,6 +1349,7 @@ class TestMultipleConfigs(unittest.TestCase, DBusUtil):
self.setUpSession("@DEFAULT")
config = self.session.GetConfig(False, utf8_strings=True)
self.failUnlessEqual(config[""]["defaultPeer"], "foobar_peer")
self.failUnlessEqual(config[""]["deviceId"], "shared-device-identifier")
self.failUnless("source/addressbook" in config)
self.failIf("uri" in config["source/addressbook"])
self.session.Detach()