copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use BareJID when sending message to ourself

This commit is contained in:
Philipp Hörist 2017-03-19 19:34:30 +01:00
parent e02798dc19
commit c49d13bcae
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/connection.py
View File

@ -355,6 +355,9 @@ class CommonConnection:
else: else:
msgtxt = obj.message msgtxt = obj.message
if obj.jid == gajim.get_jid_from_account(self.name):
fjid = obj.jid
else:
fjid = obj.get_full_jid() fjid = obj.get_full_jid()
if obj.correction_msg: if obj.correction_msg:

3
src/message_control.py
View File

@ -235,7 +235,8 @@ class MessageControl(object):
conn = gajim.connections[self.account] conn = gajim.connections[self.account]
if not self.session: if not self.session:
if not obj.resource: if (not obj.resource and
obj.jid != gajim.get_jid_from_account(self.account)):
if self.resource: if self.resource:
obj.resource = self.resource obj.resource = self.resource
else: else:

2
src/roster_window.py
View File

@ -3916,7 +3916,7 @@ class RosterWindow:
contact = gajim.contacts.get_contact_with_highest_priority(account, contact = gajim.contacts.get_contact_with_highest_priority(account,
jid) jid)
if jid == gajim.get_jid_from_account(account): if jid == gajim.get_jid_from_account(account):
resource = contact.resource resource = None
gajim.interface.on_open_chat_window(None, contact, account, \ gajim.interface.on_open_chat_window(None, contact, account, \
resource=resource, session=session) resource=resource, session=session)