Merge branch 'master' into plugins

Conflicts:
	src/core.py

1 files changed, 15 insertions, 2 deletions

diff --git a/src/tabs.py b/src/tabs.py
index 7e6c5dd2..63b1628f 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -305,7 +305,7 @@ class ChatTab(Tab):
         # build the list of the recent words
         char_we_dont_want = string.punctuation+' '
         words = list()
-        for msg in self.messages[:-40:-1]:
+        for msg in self._text_buffer.messages[:-40:-1]:
             if not msg:
                 continue
             txt = xhtml.clean_text(msg.txt)
@@ -498,7 +498,7 @@ class MucTab(ChatTab):
         """
         /clear
         """
-        self.messages = []
+        self._text_buffer.messages = []
         self.text_win.rebuild_everything(self._text_buffer)
         self.refresh()
         self.core.doupdate()
@@ -1863,6 +1863,7 @@ class ConversationTab(ChatTab):
         self.commands['unquery'] = (self.command_unquery, _("Usage: /unquery\nUnquery: close the tab"), None)
         self.commands['close'] = (self.command_unquery, _("Usage: /close\Close: close the tab"), None)
         self.commands['version'] = (self.command_version, _('Usage: /version\nVersion: get the software version of the current interlocutor (usually its XMPP client and Operating System)'), None)
+        self.commands['info'] = (self.command_info, _('Usage: /info\nInfo: get the status of the contact.'), None)
         self.resize()
 
     def completion(self):
@@ -1886,6 +1887,18 @@ class ConversationTab(ChatTab):
         self.text_win.refresh()
         self.input.refresh()
 
+    def command_info(self, arg):
+        contact = roster.get_contact_by_jid(self.get_name())
+        jid = JID(self.get_name())
+        if jid.resource:
+            resource = contact.get_resource_by_fulljid(jid.full)
+        else:
+            resource = contact.get_highest_priority_resource()
+        if resource:
+            self._text_buffer.add_message("\x195}Status: %s\x193}" %resource.get_status(), None, None, None, None, None)
+            self.refresh()
+            self.core.doupdate()
+
     def command_unquery(self, arg):
         self.core.close_tab()