diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2017-10-07 12:30:24 +0100 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2017-10-07 12:30:24 +0100 |
| commit | 27d2157c7402f1c384e378f2b26cd15584b82c3c (patch) | |
| tree | abc75b1fbae378adb01ca11526703382ae2b9244 | |
| parent | 8eb7f73befec4ff0c03dfa377a59aa86cedca63e (diff) | |
| download | poezio-27d2157c7402f1c384e378f2b26cd15584b82c3c.tar.gz poezio-27d2157c7402f1c384e378f2b26cd15584b82c3c.tar.bz2 poezio-27d2157c7402f1c384e378f2b26cd15584b82c3c.tar.xz poezio-27d2157c7402f1c384e378f2b26cd15584b82c3c.zip | |
contact: Remove now-unused alias of presence to show.
| -rw-r--r-- | poezio/contact.py | 2 | ||||
| -rw-r--r-- | poezio/tabs/conversationtab.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/poezio/contact.py b/poezio/contact.py index 883c607a..6e01e41e 100644 --- a/poezio/contact.py +++ b/poezio/contact.py @@ -40,8 +40,6 @@ class Resource(object): def presence(self): return self._data.get('show') or '' - show = presence - @property def status(self): return self._data.get('status') or '' diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py index 8da8f5ca..9f7c1391 100644 --- a/poezio/tabs/conversationtab.py +++ b/poezio/tabs/conversationtab.py @@ -200,7 +200,7 @@ class ConversationTab(OneToOneTab): if resource: status = ('Status: %s' % resource.status) if resource.status else '' self._text_buffer.add_message("\x19%(info_col)s}Show: %(show)s, %(status)s\x19o" % { - 'show': resource.show or 'available', 'status': status, 'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)}) + 'show': resource.presence or 'available', 'status': status, 'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)}) return True else: self._text_buffer.add_message("\x19%(info_col)s}No information available\x19o" % {'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)}) |