take incoming nickname from first message into account. see #884
This commit is contained in:
parent
f15305b7c6
commit
c86f7fcef4
1 changed files with 3 additions and 3 deletions
|
@ -393,7 +393,7 @@ class RosterWindow:
|
||||||
model.set_value(iter, 1 , gtkgui_helpers.escape_for_pango_markup(
|
model.set_value(iter, 1 , gtkgui_helpers.escape_for_pango_markup(
|
||||||
'%s (%s/%s)' % (group, repr(nbr_on), repr(nbr_total))))
|
'%s (%s/%s)' % (group, repr(nbr_on), repr(nbr_total))))
|
||||||
|
|
||||||
def add_to_not_in_the_roster(self, account, jid):
|
def add_to_not_in_the_roster(self, account, jid, nick = ''):
|
||||||
''' add jid to group "not in the roster", he MUST not be in roster yet,
|
''' add jid to group "not in the roster", he MUST not be in roster yet,
|
||||||
return contact '''
|
return contact '''
|
||||||
keyID = ''
|
keyID = ''
|
||||||
|
@ -402,7 +402,7 @@ class RosterWindow:
|
||||||
if jid in attached_keys:
|
if jid in attached_keys:
|
||||||
keyID = attached_keys[attached_keys.index(jid) + 1]
|
keyID = attached_keys[attached_keys.index(jid) + 1]
|
||||||
contact = gajim.contacts.create_contact(jid = jid,
|
contact = gajim.contacts.create_contact(jid = jid,
|
||||||
name = '', groups = [_('Not in Roster')],
|
name = nick, groups = [_('Not in Roster')],
|
||||||
show = 'not in roster', status = '', sub = 'none',
|
show = 'not in roster', status = '', sub = 'none',
|
||||||
keyID = keyID)
|
keyID = keyID)
|
||||||
gajim.contacts.add_contact(account, contact)
|
gajim.contacts.add_contact(account, contact)
|
||||||
|
@ -2936,7 +2936,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
|
||||||
contact = highest_contact
|
contact = highest_contact
|
||||||
if not contact:
|
if not contact:
|
||||||
# contact is not in roster
|
# contact is not in roster
|
||||||
contact = self.add_to_not_in_the_roster(account, jid)
|
contact = self.add_to_not_in_the_roster(account, jid, user_nick)
|
||||||
|
|
||||||
path = self.get_path(jid, account) # Try to get line of contact in roster
|
path = self.get_path(jid, account) # Try to get line of contact in roster
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue