diff frontends/src/primitivus/chat.py @ 1058:0a9986452bba

frontends: fixes bug with private message introduced with revision 1000 (6f1e03068b5f) + display messages from contacts not in roster
author souliane <souliane@mailoo.org>
date Thu, 29 May 2014 14:34:01 +0200
parents b12706d164d7
children 6ec513ad92c2
line wrap: on
line diff
--- a/frontends/src/primitivus/chat.py	Sun Jun 08 17:39:21 2014 +0200
+++ b/frontends/src/primitivus/chat.py	Thu May 29 14:34:01 2014 +0200
@@ -25,7 +25,7 @@
 from sat_frontends.primitivus.card_game import CardGame
 from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate
 from sat_frontends.primitivus.xmlui import XMLUI
-from sat_frontends.primitivus.constants import Const
+from sat_frontends.primitivus.constants import Const as C
 import time
 from sat.tools.jid  import JID
 
@@ -179,18 +179,18 @@
     def updateChatState(self, state, nick=None):
         """Set the chat state (XEP-0085) of the contact. Leave nick to None
         to set the state for a one2one conversation, or give a nickname or
-        Const.ALL_OCCUPANTS to set the state of a participant within a MUC.
+        C.ALL_OCCUPANTS to set the state of a participant within a MUC.
         @param state: the new chat state
-        @param nick: None for one2one, the MUC user nick or Const.ALL_OCCUPANTS
+        @param nick: None for one2one, the MUC user nick or C.ALL_OCCUPANTS
         """
         if nick:
             assert(self.type == 'group')
-            occupants = self.occupants if nick == Const.ALL_OCCUPANTS else [nick]
+            occupants = self.occupants if nick == C.ALL_OCCUPANTS else [nick]
             options = self.present_wid.getAllValues()
             for index in xrange(0, len(options)):
                 nick = options[index].value
                 if nick in occupants:
-                    options[index] = (nick, '%s %s' % (Const.MUC_USER_STATES[state], nick))
+                    options[index] = (nick, '%s %s' % (C.MUC_USER_STATES[state], nick))
             self.present_wid.changeValues(options)
             self.host.redraw()
         else:
@@ -209,7 +209,7 @@
         full_jid = JID("%s/%s" % (self.target.bare, nick))
         new_jid = escapePrivate(full_jid)
         if new_jid not in self.host.contact_list:
-            self.host.contact_list.add(new_jid)
+            self.host.contact_list.add(new_jid, [C.GROUP_NOT_IN_ROSTER])
 
         #now we select the new window
         self.host.contact_list.setFocus(full_jid, True)