diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-09-13 11:00:58 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-09-13 11:00:58 -0700 |
| commit | 67147570e9be7f51fd079c98f1d6db35fe28563c (patch) | |
| tree | 65d5ba86be1cbc7fc6cebca7a547b5efebceb028 /sleekxmpp/plugins/xep_0115 | |
| parent | df9ac58d051e195143875e03ce09a3994ade0e00 (diff) | |
| parent | fb3e6b7e35bb949f73a756ae5be683e2fec12454 (diff) | |
| download | slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.gz slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.bz2 slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.xz slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0115')
| -rw-r--r-- | sleekxmpp/plugins/xep_0115/caps.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/xep_0115/caps.py b/sleekxmpp/plugins/xep_0115/caps.py index 5130cc98..b7a346c0 100644 --- a/sleekxmpp/plugins/xep_0115/caps.py +++ b/sleekxmpp/plugins/xep_0115/caps.py @@ -143,6 +143,11 @@ class XEP_0115(BasePlugin): if str(existing_verstring) == str(pres['caps']['ver']): return + existing_caps = self.get_caps(verstring=pres['caps']['ver']) + if existing_caps is not None: + self.assign_verstring(pres['from'], pres['caps']['ver']) + return + if pres['caps']['hash'] not in self.hashes: try: log.debug("Unknown caps hash: %s", pres['caps']['hash']) |