Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-09-06 09:19:02 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-09-06 11:06:49 (GMT) |
| commit | 1e2c3461458f4274d539daf51507ce81d845cce0 (patch) | |
| tree | 9507863b011691f22212d5cc76d484dff1343d36 /Slimber/Server.cpp | |
| parent | e8dbe2e2b78cd5e4a66e2e580e12d05b2e69b120 (diff) | |
| download | swift-1e2c3461458f4274d539daf51507ce81d845cce0.zip swift-1e2c3461458f4274d539daf51507ce81d845cce0.tar.bz2 | |
Partial VCard support without losing unknown data.
Diffstat (limited to 'Slimber/Server.cpp')
| -rw-r--r-- | Slimber/Server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp index 7ec3b66..734f3b8 100644 --- a/Slimber/Server.cpp +++ b/Slimber/Server.cpp | |||
| @@ -405,12 +405,12 @@ LinkLocalServiceInfo Server::getLinkLocalServiceInfo(boost::shared_ptr<Presence> | |||
| 405 | info.setLastName(p.second); | 405 | info.setLastName(p.second); |
| 406 | } | 406 | } |
| 407 | if (!vcard->getNickname().isEmpty()) { | 407 | if (!vcard->getNickname().isEmpty()) { |
| 408 | info.setNick(vcard->getNickname()); | 408 | info.setNick(vcard->getNickname()); |
| 409 | } | 409 | } |
| 410 | if (!vcard->getEMail().isEmpty()) { | 410 | if (!vcard->getPreferredEMailAddress().address.isEmpty()) { |
| 411 | info.setEMail(vcard->getEMail()); | 411 | info.setEMail(vcard->getPreferredEMailAddress().address); |
| 412 | } | 412 | } |
| 413 | info.setMessage(presence->getStatus()); | 413 | info.setMessage(presence->getStatus()); |
| 414 | switch (presence->getShow()) { | 414 | switch (presence->getShow()) { |
| 415 | case StatusShow::Online: | 415 | case StatusShow::Online: |
| 416 | case StatusShow::None: | 416 | case StatusShow::None: |