rpms/jabbim/devel jabbim-0.5-fix-compact-roster-drawing.diff, NONE, 1.1

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14307

Added Files:
	jabbim-0.5-fix-compact-roster-drawing.diff 
Log Message:
cvs add the patch


jabbim-0.5-fix-compact-roster-drawing.diff:
 style.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jabbim-0.5-fix-compact-roster-drawing.diff ---
commit 1e6896cb9cd32df467baf44cdb0abbfe478b04ec
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date:   Tue Sep 8 07:26:54 2009 +0000

    Roster drawing fix
    
    With compact roster style and a non-ASCII contact name, opening a chat
    with the contact would cause the roster to stop drawing all contacts
    below it. Caused by QString+unicode mismatch.
    
    git-svn-id: svn://dev.jabbim.cz/jabbim/trunk@4224 4aba8365-6129-0410-a408-ea17bd48e33e

diff --git a/rosterstyles/compact/style.py b/rosterstyles/compact/style.py
index b07ae16..04ea89d 100644
--- a/rosterstyles/compact/style.py
+++ b/rosterstyles/compact/style.py
@@ -148,9 +148,9 @@ class rosterStyle:
 					res=" ("+str(len(self.roster.main.client.roster['users'][useritem.jid].resources))+")"
 
 				if self.roster.theme:
-					doc.setHtml("<font color=\""+self.roster.main.ui.userStyleWidget.palette().color(QtGui.QPalette.Text).name()+"\">"+useritem.escapedName+res+"</font>")
+					doc.setHtml("<font color=\""+unicode(self.roster.main.ui.userStyleWidget.palette().color(QtGui.QPalette.Text).name())+"\">"+useritem.escapedName+res+"</font>")
 				else:
-					doc.setHtml("<font color=\""+self.roster.palet.color(QtGui.QPalette.HighlightedText).name()+"\">"+useritem.escapedName+res+"</font>")
+					doc.setHtml("<font color=\""+unicode(self.roster.palet.color(QtGui.QPalette.HighlightedText).name())+"\">"+useritem.escapedName+res+"</font>")
 
 				painter.save()
 				painter.translate(x+41,y+(22-fontHeight)/2)