From 98432f6666167a15443726a453a5602fdb0f30de Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sat, 27 Aug 2011 22:41:55 +0200 Subject: cean chatstate code: remove XEP-0022 support and use caps to know if a contact supports it --- plugins/banner_tweaks/plugin.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'plugins') diff --git a/plugins/banner_tweaks/plugin.py b/plugins/banner_tweaks/plugin.py index a100cfe45..2e7faeb31 100644 --- a/plugins/banner_tweaks/plugin.py +++ b/plugins/banner_tweaks/plugin.py @@ -135,27 +135,17 @@ class BannerTweaksPlugin(GajimPlugin): if cs and st in ('composing_only', 'all'): if contact.show == 'offline': chatstate = '' - elif contact.composing_xep == 'XEP-0085': - if st == 'all' or cs == 'composing': - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' - elif contact.composing_xep == 'XEP-0022': - if cs in ('composing', 'paused'): - # only print composing, paused - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' - else: - # When does that happen ? See [7797] and [7804] + elif st == 'all' or cs == 'composing': chatstate = helpers.get_uf_chatstate(cs) + else: + chatstate = '' label_text = '%s%s %s' % \ - (font_attrs, name, font_attrs_small, acct_info, chatstate) + (font_attrs, name, font_attrs_small, acct_info, chatstate) else: # weight="heavy" size="x-large" label_text = '%s%s' % \ - (font_attrs, name, font_attrs_small, acct_info) + (font_attrs, name, font_attrs_small, acct_info) banner_name_label.set_markup(label_text) -- cgit v1.2.3