Philipp Hörist pushed to branch master at gajim / gajim
Commits:
86bbdd21 by Philipp Hörist at 2018-12-04T18:43:13Z
Encode resource with correct profile
Fixes #9465
- - - - -
c2e2dd9a by Philipp Hörist at 2018-12-04T18:43:55Z
Fix MUC nick change
- - - - -
2 changed files:
- gajim/common/helpers.py
- gajim/groupchat_control.py
Changes:
=====================================
gajim/common/helpers.py
=====================================
@@ -154,7 +154,7 @@ def parse_resource(resource):
"""
if resource:
try:
- return resource.encode('Nickname').decode('utf-8')
+ return resource.encode('OpaqueString').decode('utf-8')
except UnicodeError:
raise InvalidFormat('Invalid character in resource.')
=====================================
gajim/groupchat_control.py
=====================================
@@ -1812,7 +1812,7 @@ class GroupchatControl(ChatControlBase):
elif '303' in obj.status_code: # Someone changed their nick
if obj.new_nick == self.new_nick or obj.nick == self.nick:
# We changed our nick
- self.change_nick(obj.new_nick)
+ self._change_nick(obj.new_nick)
self.new_nick = ''
s = _('You are now known as %s') % self.nick
else:
@@ -1882,7 +1882,7 @@ class GroupchatControl(ChatControlBase):
if not iter_:
if '210' in obj.status_code:
# Server changed our nick
- self.change_nick(obj.nick)
+ self._change_nick(obj.nick)
s = _('You are now known as %s') % nick
self.print_conversation(s, 'info', graphics=False)
iter_ = self.add_contact_to_roster(obj.nick, obj.show, role,
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/932377f533a97d25aabf210b4fe52fb0a4ad0738...c2e2dd9a87a89e51bab756f11f253a6c0e66ba8d
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/932377f533a97d25aabf210b4fe52fb0a4ad0738...c2e2dd9a87a89e51bab756f11f253a6c0e66ba8d
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
