Permalink
Browse files

Merge commit 'remotes/alexandernst/master'

  • Loading branch information...
billiob committed Sep 27, 2009
2 parents 78d4a08 + c1e2695 commit 60595559506fcd5a7881e931b354af455d676a58
Showing with 2 additions and 1 deletion.
  1. +2 −1 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

0 comments on commit 6059555

Please sign in to comment.