A subactivity of other means we have no subactivity.

This commit is contained in:
js 2008-10-24 17:10:30 +00:00
parent 90b2d8fa8d
commit 9519d1bd6a

View file

@ -332,7 +332,7 @@ def user_activity(items, name, jid):
del acc.activity['text'] del acc.activity['text']
if activity is not None: if activity is not None:
acc.activity['activity'] = activity acc.activity['activity'] = activity
if subactivity is not None: if subactivity is not None and subactivity != 'other':
acc.activity['subactivity'] = subactivity acc.activity['subactivity'] = subactivity
if text is not None: if text is not None:
acc.activity['text'] = text acc.activity['text'] = text
@ -355,7 +355,7 @@ def user_activity(items, name, jid):
del contact.activity['text'] del contact.activity['text']
if activity is not None: if activity is not None:
contact.activity['activity'] = activity contact.activity['activity'] = activity
if subactivity is not None: if subactivity is not None and subactivity != 'other':
contact.activity['subactivity'] = subactivity contact.activity['subactivity'] = subactivity
if text is not None: if text is not None:
contact.activity['text'] = text contact.activity['text'] = text