always talk to fake jid even if we know real jid (revert [4172]) so we can find the contact from the jid (before we couldn't find from real jid cause in gc_contacts it's fake jid)
This commit is contained in:
parent
647aef402e
commit
a3e0d6afec
|
@ -1570,11 +1570,7 @@ current room topic.') % command, room_jid)
|
||||||
fjid = gajim.construct_fjid(room_jid, nick)
|
fjid = gajim.construct_fjid(room_jid, nick)
|
||||||
if not gajim.interface.instances[self.account]['chats'].has_key(fjid):
|
if not gajim.interface.instances[self.account]['chats'].has_key(fjid):
|
||||||
show = gajim.gc_contacts[self.account][room_jid][nick].show
|
show = gajim.gc_contacts[self.account][room_jid][nick].show
|
||||||
c = gajim.gc_contacts[self.account][room_jid][nick]
|
u = Contact(jid = fjid, name = nick, groups = ['none'],
|
||||||
j = fjid
|
|
||||||
if c.jid:
|
|
||||||
j = c.jid
|
|
||||||
u = Contact(jid = j, name = nick, groups = ['none'],
|
|
||||||
show = show, sub = 'none')
|
show = show, sub = 'none')
|
||||||
gajim.interface.roster.new_chat(u, self.account)
|
gajim.interface.roster.new_chat(u, self.account)
|
||||||
gajim.interface.instances[self.account]['chats'][fjid].set_active_tab(fjid)
|
gajim.interface.instances[self.account]['chats'][fjid].set_active_tab(fjid)
|
||||||
|
@ -1618,12 +1614,8 @@ current room topic.') % command, room_jid)
|
||||||
jid = gajim.construct_fjid(room_jid, nick)
|
jid = gajim.construct_fjid(room_jid, nick)
|
||||||
if not gajim.interface.instances[self.account]['chats'].has_key(jid):
|
if not gajim.interface.instances[self.account]['chats'].has_key(jid):
|
||||||
show = gajim.gc_contacts[self.account][room_jid][nick].show
|
show = gajim.gc_contacts[self.account][room_jid][nick].show
|
||||||
c = gajim.gc_contacts[self.account][room_jid][nick]
|
contact = Contact(jid = jid, name = nick, groups = ['none'],
|
||||||
j = jid
|
show = show, sub = 'none')
|
||||||
if c.jid:
|
|
||||||
j = c.jid
|
|
||||||
contact = Contact(jid = j, name = nick, groups = ['none'], show = show,
|
|
||||||
sub = 'none')
|
|
||||||
gajim.interface.roster.new_chat(contact, self.account)
|
gajim.interface.roster.new_chat(contact, self.account)
|
||||||
jid = contact.jid
|
jid = contact.jid
|
||||||
gajim.interface.instances[self.account]['chats'][jid].set_active_tab(jid)
|
gajim.interface.instances[self.account]['chats'][jid].set_active_tab(jid)
|
||||||
|
|
Loading…
Reference in New Issue