upadte all contact instances when we get a pep event for a contact. See #3953

This commit is contained in:
Yann Leboulanger 2008-05-20 14:18:12 +00:00
parent e2f98ad2e0
commit 8bda3a5543

View file

@ -35,23 +35,21 @@ def user_mood(items, name, jid):
del acc.mood['text'] del acc.mood['text']
(user, resource) = gajim.get_room_and_nick_from_fjid(jid) (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
contact = gajim.contacts.get_contact(name, user, resource=resource) for contact in gajim.contacts.get_contacts(name, user)
if not contact: if has_child:
return if contact.mood.has_key('mood'):
if has_child: del contact.mood['mood']
if contact.mood.has_key('mood'): if contact.mood.has_key('text'):
del contact.mood['mood'] del contact.mood['text']
if contact.mood.has_key('text'): if mood is not None:
del contact.mood['text'] contact.mood['mood'] = mood
if mood is not None: if text is not None:
contact.mood['mood'] = mood contact.mood['text'] = text
if text is not None: elif retract:
contact.mood['text'] = text if contact.mood.has_key('mood'):
elif retract: del contact.mood['mood']
if contact.mood.has_key('mood'): if contact.mood.has_key('text'):
del contact.mood['mood'] del contact.mood['text']
if contact.mood.has_key('text'):
del contact.mood['text']
def user_tune(items, name, jid): def user_tune(items, name, jid):
has_child = False has_child = False
@ -116,41 +114,39 @@ def user_tune(items, name, jid):
del acc.tune['length'] del acc.tune['length']
(user, resource) = gajim.get_room_and_nick_from_fjid(jid) (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
contact = gajim.contacts.get_contact(name, user, resource=resource) for contact in gajim.contacts.get_contacts(name, user)
if not contact: if has_child:
return if contact.tune.has_key('artist'):
if has_child: del contact.tune['artist']
if contact.tune.has_key('artist'): if contact.tune.has_key('title'):
del contact.tune['artist'] del contact.tune['title']
if contact.tune.has_key('title'): if contact.tune.has_key('source'):
del contact.tune['title'] del contact.tune['source']
if contact.tune.has_key('source'): if contact.tune.has_key('track'):
del contact.tune['source'] del contact.tune['track']
if contact.tune.has_key('track'): if contact.tune.has_key('length'):
del contact.tune['track'] del contact.tune['length']
if contact.tune.has_key('length'): if artist is not None:
del contact.tune['length'] contact.tune['artist'] = artist
if artist is not None: if title is not None:
contact.tune['artist'] = artist contact.tune['title'] = title
if title is not None: if source is not None:
contact.tune['title'] = title contact.tune['source'] = source
if source is not None: if track is not None:
contact.tune['source'] = source contact.tune['track'] = track
if track is not None: if length is not None:
contact.tune['track'] = track contact.tune['length'] = length
if length is not None: elif retract:
contact.tune['length'] = length if contact.tune.has_key('artist'):
elif retract: del contact.tune['artist']
if contact.tune.has_key('artist'): if contact.tune.has_key('title'):
del contact.tune['artist'] del contact.tune['title']
if contact.tune.has_key('title'): if contact.tune.has_key('source'):
del contact.tune['title'] del contact.tune['source']
if contact.tune.has_key('source'): if contact.tune.has_key('track'):
del contact.tune['source'] del contact.tune['track']
if contact.tune.has_key('track'): if contact.tune.has_key('length'):
del contact.tune['track'] del contact.tune['length']
if contact.tune.has_key('length'):
del contact.tune['length']
def user_geoloc(items, name, jid): def user_geoloc(items, name, jid):
pass pass
@ -200,29 +196,27 @@ def user_activity(items, name, jid):
del acc.activity['text'] del acc.activity['text']
(user, resource) = gajim.get_room_and_nick_from_fjid(jid) (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
contact = gajim.contacts.get_contact(name, user, resource=resource) for contact in gajim.contacts.get_contacts(name, user)
if not contact: if has_child:
return if contact.activity.has_key('activity'):
if has_child: del contact.activity['activity']
if contact.activity.has_key('activity'): if contact.activity.has_key('subactivity'):
del contact.activity['activity'] del contact.activity['subactivity']
if contact.activity.has_key('subactivity'): if contact.activity.has_key('text'):
del contact.activity['subactivity'] del contact.activity['text']
if contact.activity.has_key('text'): if activity is not None:
del contact.activity['text'] contact.activity['activity'] = activity
if activity is not None: if subactivity is not None:
contact.activity['activity'] = activity contact.activity['subactivity'] = subactivity
if subactivity is not None: if text is not None:
contact.activity['subactivity'] = subactivity contact.activity['text'] = text
if text is not None: elif retract:
contact.activity['text'] = text if contact.activity.has_key('activity'):
elif retract: del contact.activity['activity']
if contact.activity.has_key('activity'): if contact.activity.has_key('subactivity'):
del contact.activity['activity'] del contact.activity['subactivity']
if contact.activity.has_key('subactivity'): if contact.activity.has_key('text'):
del contact.activity['subactivity'] del contact.activity['text']
if contact.activity.has_key('text'):
del contact.activity['text']
def user_nickname(items, name, jid): def user_nickname(items, name, jid):
has_child = False has_child = False
@ -246,12 +240,10 @@ def user_nickname(items, name, jid):
gajim.nicks[name] = gajim.config.get_per('accounts', name, 'name') gajim.nicks[name] = gajim.config.get_per('accounts', name, 'name')
(user, resource) = gajim.get_room_and_nick_from_fjid(jid) (user, resource) = gajim.get_room_and_nick_from_fjid(jid)
contact = gajim.contacts.get_contact(name, user, resource=resource)
if not contact:
return
if has_child: if has_child:
if nick is not None: if nick is not None:
contact.contact_name = nick for contact in gajim.contacts.get_contacts(name, user)
contact.contact_name = nick
gajim.interface.roster.draw_contact(user, name) gajim.interface.roster.draw_contact(user, name)
for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(user, name): for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(user, name):
ctrl.update_ui() ctrl.update_ui()