Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-09-24 18:28:28 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-09-24 18:28:28 (GMT)
commit6d79687f8b75dc29e4bcd192a74ecf9c8f789afd (patch)
tree9c8a53a72feb584818ab174dd017a7c97b8a74b8
parent33aa69b4667273ff900f3b5c8d357ef2108321e6 (diff)
Bug#3683: don't use (potentially long) user-supplied nickname in mDNS instance, it can break Salut activity advertisement
-rw-r--r--NEWS2
-rw-r--r--src/linklocal_plugin.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c651514..e76d0f7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* #3683: don't use (potentially long) user-supplied nickname in mDNS instance
+ names, this can break Salut activity advertisement (smcv)
* #3422: don't emit spurious CurrentActivityChanged signal when changing from
no current activity to no current activity (smcv)
* #3465: don't keep invite-only activities in the mesh view after we leave
diff --git a/src/linklocal_plugin.py b/src/linklocal_plugin.py
index 301687c..5646018 100644
--- a/src/linklocal_plugin.py
+++ b/src/linklocal_plugin.py
@@ -102,7 +102,7 @@ class LinkLocalPlugin(TelepathyPlugin):
'first-name': ' ',
'last-name': '%s' % self._owner.props.nick,
'jid': '%s@%s' % (khash, server),
- 'published-name': '%s' % self._owner.props.nick,
+ 'published-name': '%s' % khash[:8],
}
def _find_existing_connection(self):