From 7928e82d48cdafdefc6c6a9bdab8c80636a2491c Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 1 Jan 2006 18:53:30 +0000 Subject: [PATCH] end of gc_contact.nick -> gc_contact.name --- src/common/contacts.py | 6 +++--- src/gajim.py | 4 ++-- src/groupchat_window.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/contacts.py b/src/common/contacts.py index a95b1bfc0..139b6e609 100644 --- a/src/common/contacts.py +++ b/src/common/contacts.py @@ -58,7 +58,7 @@ class Contact: class GC_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 = ''): self.room_jid = room_jid self.name = name @@ -230,9 +230,9 @@ class Contacts: groups = ['none'], show = gc_contact.show, status = gc_contact.status, 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=''): - 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): # No such account before ? diff --git a/src/gajim.py b/src/gajim.py index 0f770870e..3cf0c7b28 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -488,7 +488,7 @@ class Interface: else: show = 'offline' 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) self.roster.new_chat(c, account) self.instances[account]['chats'][fjid].print_conversation( @@ -1258,7 +1258,7 @@ class Interface: else: show = 'offline' 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) self.roster.new_chat(c, account) w = wins['chats'][jid] diff --git a/src/groupchat_window.py b/src/groupchat_window.py index 95ec1459c..5587524e2 100644 --- a/src/groupchat_window.py +++ b/src/groupchat_window.py @@ -375,7 +375,7 @@ class GroupchatWindow(chat.Chat): iter = model.append(role_iter, (None, 'contact', nick, name)) if not nick in gajim.contacts.get_nick_list(self.account, 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) gajim.contacts.add_gc_contact(self.account, gc_contact) self.draw_contact(room_jid, nick)