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

Use contacts.py from trunk and bug fix

This commit is contained in:
Travis Shirk 2006-01-08 05:27:36 +00:00
parent 1e49d5be44
commit ad087f10c4
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_control.py
View File

@ -700,7 +700,7 @@ class ChatControl(ChatControlBase):
avatar_w = avatar_pixbuf.get_width() avatar_w = avatar_pixbuf.get_width()
avatar_h = avatar_pixbuf.get_height() 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_w = scaled_buf.get_width()
scaled_buf_h = scaled_buf.get_height() scaled_buf_h = scaled_buf.get_height()

24
src/common/contacts.py
View File

@ -24,23 +24,16 @@
import common.gajim import common.gajim
class ContactBase: class Contact:
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):
'''Information concerning each contact''' '''Information concerning each contact'''
def __init__(self, jid='', name='', groups=[], show='', status='', sub='', def __init__(self, jid='', name='', groups=[], show='', status='', sub='',
ask='', resource='', priority=5, keyID='', our_chatstate=None, ask='', resource='', priority=5, keyID='', our_chatstate=None,
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.groups = groups
self.show = show
self.status = status
self.sub = sub self.sub = sub
self.ask = ask self.ask = ask
self.resource = resource self.resource = resource
@ -63,14 +56,17 @@ class Contact(ContactBase):
return self.jid + '/' + self.resource return self.jid + '/' + self.resource
return self.jid return self.jid
class GC_Contact(ContactBase): class GC_Contact:
'''Information concerning each groupchat contact''' '''Information concerning each groupchat contact'''
def __init__(self, room_jid='', name='', show='', status='', role='', def __init__(self, room_jid='', name='', show='', status='', role='',
affiliation='', jid = '', resource = ''): affiliation='', jid = '', resource = ''):
ContactBase.__init__(self, jid = jid, name = name, status = status, show = show)
self.room_jid = room_jid self.room_jid = room_jid
self.name = name
self.show = show
self.status = status
self.role = role self.role = role
self.affiliation = affiliation self.affiliation = affiliation
self.jid = jid
self.resource = resource self.resource = resource
def get_full_jid(self): def get_full_jid(self):