From d9f5bd08e821529a9b5ff7eda7091d9482190bea Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 14 Dec 2003 21:13:28 +0000
Subject: [PATCH] now accents can be sent

---
 common/jabber.py            | 5 +++--
 plugins/gtkgui/gtkgui.glade | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/jabber.py b/common/jabber.py
index 943f925f1..d5681ff78 100644
--- a/common/jabber.py
+++ b/common/jabber.py
@@ -62,7 +62,7 @@ An example of usage for a simple client would be ( only psuedo code !)
 
 """
 
-# $Id: jabber.py,v 1.1.1.1 2003/10/22 18:45:18 tab Exp $
+# $Id: jabber.py,v 1.2 2003/11/01 19:41:35 asterix86 Exp $
 
 import xmlstream
 import sha, time
@@ -177,7 +177,8 @@ def ustr(what, encoding=USTR_ENCODING):
         r = what.__str__()
         # make sure __str__() didnt return a unicode
         if type(r) <> type(u''):
-            r = unicode(r,encoding,'replace')
+#            r = unicode(r,encoding,'replace')
+            r = unicode(r)
     return r
 
 
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index d64c08e23..3aa957bf3 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -532,7 +532,6 @@
 	<widget class="GtkVPaned" id="vpaned1">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
-	  <property name="position">190</property>
 
 	  <child>
 	    <widget class="GtkScrolledWindow" id="scrolledwindow3">