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

end of gc_contact.nick -> gc_contact.name

This commit is contained in:
Yann Leboulanger 2006-01-01 18:53:30 +00:00
parent 1a96012420
commit 7928e82d48
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/contacts.py
View File

@ -58,7 +58,7 @@ class Contact:
class GC_Contact: class GC_Contact:
'''Information concerning each groupchat contact''' '''Information concerning each groupchat contact'''
def __init__(self, room_jid='', nick='', show='', status='', role='', def __init__(self, room_jid='', name='', show='', status='', role='',
affiliation='', jid = ''): affiliation='', jid = ''):
self.room_jid = room_jid self.room_jid = room_jid
self.name = name self.name = name
@ -230,9 +230,9 @@ class Contacts:
groups = ['none'], show = gc_contact.show, status = gc_contact.status, groups = ['none'], show = gc_contact.show, status = gc_contact.status,
sub = 'none') sub = 'none')
def create_gc_contact(self, room_jid='', nick='', show='', status='', def create_gc_contact(self, room_jid='', name='', show='', status='',
role='', affiliation='', jid=''): role='', affiliation='', jid=''):
return GC_Contact(room_jid, nick, show, status, role, affiliation, jid) return GC_Contact(room_jid, name, show, status, role, affiliation, jid)
def add_gc_contact(self, account, gc_contact): def add_gc_contact(self, account, gc_contact):
# No such account before ? # No such account before ?

4
src/gajim.py
View File

@ -488,7 +488,7 @@ class Interface:
else: else:
show = 'offline' show = 'offline'
gc_c = gajim.contacts.create_gc_contact(room_jid = jid, gc_c = gajim.contacts.create_gc_contact(room_jid = jid,
nick = nick, show = show) name = nick, show = show)
c = gajim.contacts.contact_from_gc_contct(c) c = gajim.contacts.contact_from_gc_contct(c)
self.roster.new_chat(c, account) self.roster.new_chat(c, account)
self.instances[account]['chats'][fjid].print_conversation( self.instances[account]['chats'][fjid].print_conversation(
@ -1258,7 +1258,7 @@ class Interface:
else: else:
show = 'offline' show = 'offline'
gc_contact = gajim.contacts.create_gc_contact(room_jid = room_jid, gc_contact = gajim.contacts.create_gc_contact(room_jid = room_jid,
nick = nick, show = show) name = nick, show = show)
c = gajim.contacts.contact_from_gc_contct(gc_contact) c = gajim.contacts.contact_from_gc_contct(gc_contact)
self.roster.new_chat(c, account) self.roster.new_chat(c, account)
w = wins['chats'][jid] w = wins['chats'][jid]

2
src/groupchat_window.py
View File

@ -375,7 +375,7 @@ class GroupchatWindow(chat.Chat):
iter = model.append(role_iter, (None, 'contact', nick, name)) iter = model.append(role_iter, (None, 'contact', nick, name))
if not nick in gajim.contacts.get_nick_list(self.account, room_jid): if not nick in gajim.contacts.get_nick_list(self.account, room_jid):
gc_contact = gajim.contacts.create_gc_contact(room_jid = room_jid, gc_contact = gajim.contacts.create_gc_contact(room_jid = room_jid,
nick = nick, show = show, status = status, role = role, name = nick, show = show, status = status, role = role,
affiliation = affiliation, jid = jid) affiliation = affiliation, jid = jid)
gajim.contacts.add_gc_contact(self.account, gc_contact) gajim.contacts.add_gc_contact(self.account, gc_contact)
self.draw_contact(room_jid, nick) self.draw_contact(room_jid, nick)