# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1279282374 -28800
# Node ID a86607e5cf38a0f31334452ef80bfd4061f1e347
# Parent  6cad483a6d84a40b7ca735f7b6d7e5f8d8615a45
quick_app: self.occupants for group chat are now managed by quick_chat. self.options.profile now support unicode

diff -r 6cad483a6d84 -r a86607e5cf38 frontends/quick_frontend/quick_app.py
--- a/frontends/quick_frontend/quick_app.py	Wed Jul 14 19:36:40 2010 +0800
+++ b/frontends/quick_frontend/quick_app.py	Fri Jul 16 20:12:54 2010 +0800
@@ -91,6 +91,8 @@
         parser.add_option("-p", "--profile", help=_("Select the profile to use"))
 
         (self.options, args) = parser.parse_args()
+        if self.options.profile:
+            self.options.profile = self.options.profile.decode('utf-8')
         return args
 
     def plug_profile(self, profile_key='@DEFAULT@'):
@@ -141,7 +143,7 @@
         for sub in waitingSub:
             self.subscribe(waitingSub[sub], sub, profile)
 
-        #Now we open the MUC window when we already are:
+        #Now we open the MUC window where we already are:
         for room_args in self.bridge.getRoomJoined(profile):
             self.roomJoined(*room_args, profile=profile)
 
@@ -164,7 +166,7 @@
             return
         debug(_("Connected"))
         self.setStatusOnline(True)
-        #self.bridge.joinMUC('conference.necton2.int', 'test', self.profiles[self.profile]['whoami'].node, self.profile) #gof:
+        self.bridge.joinMUC('conference.necton2.int', 'test', self.profiles[self.profile]['whoami'].node, self.profile) #gof:
         
 
     def disconnected(self, profile):
diff -r 6cad483a6d84 -r a86607e5cf38 frontends/quick_frontend/quick_chat.py
--- a/frontends/quick_frontend/quick_chat.py	Wed Jul 14 19:36:40 2010 +0800
+++ b/frontends/quick_frontend/quick_chat.py	Fri Jul 16 20:12:54 2010 +0800
@@ -48,6 +48,7 @@
         if self.type != "group":
             error (_("[INTERNAL] trying to set presents nicks for a non group chat window"))
             raise Exception("INTERNAL ERROR") #TODO: raise proper Exception here
+        self.occupants.update(nicks)
     
     def replaceUser(self, nick):
         """Add user if it is not in the group list"""
@@ -55,6 +56,7 @@
         if self.type != "group":
             error (_("[INTERNAL] trying to replace user for a non group chat window"))
             raise Exception("INTERNAL ERROR") #TODO: raise proper Exception here
+        self.occupants.add(nick)
     
     def setUserNick(self, nick):
         """Set the nick of the user, usefull for e.g. change the color of the user"""
@@ -66,6 +68,7 @@
         if self.type != "group":
             error (_("[INTERNAL] trying to remove user for a non group chat window"))
             raise Exception("INTERNAL ERROR") #TODO: raise proper Exception here
+        self.occupants.remove(nick)
 
     def setSubject(self, subject):
         """Set title for a group chat"""
diff -r 6cad483a6d84 -r a86607e5cf38 frontends/wix/chat.py
--- a/frontends/wix/chat.py	Wed Jul 14 19:36:40 2010 +0800
+++ b/frontends/wix/chat.py	Fri Jul 16 20:12:54 2010 +0800
@@ -132,7 +132,6 @@
         QuickChat.setPresents(self, nicks)
         for nick in nicks:
             self.present_panel.presents.replace(nick)
-            self.occupants.add(nick)
     
     def replaceUser(self, nick):
         """Add user if it is not in the group list"""
@@ -142,13 +141,11 @@
             return
         QuickChat.replaceUser(self, nick)
         self.present_panel.presents.replace(nick)
-        self.occupants.add(nick)
 
     def removeUser(self, nick):
         """Remove a user from the group list"""
         QuickChat.removeUser(self, nick)
         self.present_panel.presents.remove(nick)
-        self.occupants.remove(nick)
 
     def setSubject(self, subject):
         """Set title for a group chat"""