Merge commit 'remotes/alexandernst/master'

drf · Sep 27, 2009 · 6059555 · 6059555
2 parents 78d4a08 + c1e2695
commit 6059555
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/amsn2/gui/front_ends/qt4/chat_window.py b/amsn2/gui/front_ends/qt4/chat_window.py
@@ -21,6 +21,7 @@
 import cgi
 import time
 import sys
+reload(sys)
 
 import papyon
 from amsn2.gui import base
@@ -86,7 +87,7 @@ def __init__(self, amsn_conversation, parent, contacts_uid):
         QObject.connect(self.ui.actionNudge, SIGNAL("triggered()"), self.__sendNudge)
 
         #TODO: remove this when papyon is "fixed"...
-        sys.setappdefaultencoding("utf8")
+        sys.setdefaultencoding("utf8")
 
     def processInput(self):
         """ Here we process what is inside the widget... so showing emoticon