diff options
| author | Travis Shirk <travis@pobox.com> | 2006-01-08 08:27:36 +0300 |
|---|---|---|
| committer | Travis Shirk <travis@pobox.com> | 2006-01-08 08:27:36 +0300 |
| commit | ad087f10c45cd3811e3ac266fdf8cc1897e392a6 (patch) | |
| tree | 6f410c68cc47ee74a00e95092aab67f07803d176 | |
| parent | 1e49d5be44e0feea6d96dc5c16241866f6775c64 (diff) | |
Use contacts.py from trunk and bug fix
| -rw-r--r-- | src/chat_control.py | 2 | ||||
| -rw-r--r-- | src/common/contacts.py | 24 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/chat_control.py b/src/chat_control.py index aa1101f53..0fdeb4949 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -700,7 +700,7 @@ class ChatControl(ChatControlBase): avatar_w = avatar_pixbuf.get_width() avatar_h = avatar_pixbuf.get_height() - scaled_buf = self.xmls[jid].get_widget('avatar_image').get_pixbuf() + scaled_buf = self.xml.get_widget('avatar_image').get_pixbuf() scaled_buf_w = scaled_buf.get_width() scaled_buf_h = scaled_buf.get_height() diff --git a/src/common/contacts.py b/src/common/contacts.py index a3bca6f85..29c2869ff 100644 --- a/src/common/contacts.py +++ b/src/common/contacts.py @@ -24,23 +24,16 @@ import common.gajim -class ContactBase: - def __init__(self, jid='', name='', show='', status=''): - self.jid = jid - self.name = name - self.show = show - self.status = status - - def get_full_jid(self): - pass # Derived types MUST implement this method - -class Contact(ContactBase): +class Contact: '''Information concerning each contact''' def __init__(self, jid='', name='', groups=[], show='', status='', sub='', ask='', resource='', priority=5, keyID='', our_chatstate=None, chatstate=None): - ContactBase.__init__(self, jid = jid, name = name, status = status, show = show) + self.jid = jid + self.name = name self.groups = groups + self.show = show + self.status = status self.sub = sub self.ask = ask self.resource = resource @@ -63,14 +56,17 @@ class Contact(ContactBase): return self.jid + '/' + self.resource return self.jid -class GC_Contact(ContactBase): +class GC_Contact: '''Information concerning each groupchat contact''' def __init__(self, room_jid='', name='', show='', status='', role='', affiliation='', jid = '', resource = ''): - ContactBase.__init__(self, jid = jid, name = name, status = status, show = show) self.room_jid = room_jid + self.name = name + self.show = show + self.status = status self.role = role self.affiliation = affiliation + self.jid = jid self.resource = resource def get_full_jid(self): |