diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2010-01-19 18:37:14 +0300 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2010-01-19 18:37:14 +0300 |
| commit | 3a76966c1462bcd65cee534a06dad4c9fc7cc494 (patch) | |
| tree | b9b4b257e02f9db2d209ec42ea57b481f1239ef5 /src/session.py | |
| parent | b38249c4066cf883ceb347b15410d32bd7e3357b (diff) | |
| parent | daf73408d7dbd5324cab1ad7ea4aaec2cb696aaa (diff) | |
merge from default branch
Diffstat (limited to 'src/session.py')
| -rw-r--r-- | src/session.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/session.py b/src/session.py index a2e911a55..e13eb0b8f 100644 --- a/src/session.py +++ b/src/session.py @@ -57,7 +57,9 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): self.detach_from_control() def get_chatstate(self, msg, msgtxt): - '''extracts chatstate from a <message/> stanza''' + """ + Extract chatstate from a <message/> stanza + """ composing_xep = None chatstate = None @@ -83,7 +85,9 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): return (composing_xep, chatstate) def received(self, full_jid_with_resource, msgtxt, tim, encrypted, msg): - '''dispatch a received <message> stanza''' + """ + Dispatch a received <message> stanza + """ msg_type = msg.getType() subject = msg.getSubject() resource = gajim.get_resource_from_jid(full_jid_with_resource) @@ -271,9 +275,11 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): def roster_message(self, jid, msg, tim, encrypted=False, msg_type='', - subject=None, resource='', msg_id=None, user_nick='', - advanced_notif_num=None, xhtml=None, form_node=None): - '''display the message or show notification in the roster''' + subject=None, resource='', msg_id=None, user_nick='', + advanced_notif_num=None, xhtml=None, form_node=None): + """ + Display the message or show notification in the roster + """ contact = None # if chat window will be for specific resource resource_for_chat = resource |