summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-08-11 23:31:03 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-08-11 23:31:03 +0200
commit94436e075b680617340884fb3dd870bcef6826e5 (patch)
treeb52872578b20ccf4d5df26962d74ede210bcd7d0 /src
parent9426b259027a1bb4afb23008daa61e22a0cbff8d (diff)
downloadpoezio-94436e075b680617340884fb3dd870bcef6826e5.tar.gz
poezio-94436e075b680617340884fb3dd870bcef6826e5.tar.bz2
poezio-94436e075b680617340884fb3dd870bcef6826e5.tar.xz
poezio-94436e075b680617340884fb3dd870bcef6826e5.zip
Fix a tb on invalid show in presence from a muc
(Displays a warning in that case, so that we can laugh about it.)
Diffstat (limited to 'src')
-rw-r--r--src/tabs.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tabs.py b/src/tabs.py
index 8f715349..e04f330e 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -931,6 +931,9 @@ class MucTab(ChatTab):
display_message = False # flag to know if something significant enough
# to be displayed has changed
msg = _('\x193%s\x195 changed: ')% from_nick.replace('"', '\\"')
+ if show not in SHOW_NAME:
+ self.core.information("%s from room %s sent an invalid show: %s" %\
+ (from_nick, from_room, show), "warning")
if affiliation != user.affiliation:
msg += _('affiliation: %s, ') % affiliation
display_message = True
@@ -942,7 +945,7 @@ class MucTab(ChatTab):
display_message = True
if status != user.status:
# if the user sets his status to nothing
- if not status:
+ if not status and show in SHOW_NAME:
msg += _('show: %s, ') % SHOW_NAME[show]
else:
msg += _('status: %s, ') % status