rpms/jabbim/F-11 jabbim-0.5-fix-compact-roster-drawing.diff, NONE, 1.1 jabbim.spec, 1.32, 1.33

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16295

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.5-fix-compact-roster-drawing.diff 
Log Message:
* Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
- Fix compact-style roster drawing bug.
  (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)


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)


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/jabbim.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- jabbim.spec	7 Sep 2009 14:42:18 -0000	1.32
+++ jabbim.spec	8 Sep 2009 07:41:51 -0000	1.33
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.7.svn%{svndate}%{?dist}
+Release:	0.8.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -13,6 +13,7 @@ URL:		http://dev.jabbim.cz/jabbim
 # tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
+Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,8 +42,9 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
+%patch1 -p1
 # replace runtime detection of the SVN revision with hardcoded info
-sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}'#" jabbim.py
+sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
 %build
 # Upstream likes to provide generated *.qm files in the tarballs.
@@ -96,6 +98,10 @@ fi
 
 
 %changelog
+* Tue Sep 08 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.8.svn20090907
+- Fix compact-style roster drawing bug.
+  (jabbim-0.5-fix-compact-roster-drawing.diff, committed upstream)
+
 * Mon Sep 07 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.7.svn20090907
 - Update to SVN rev. 4223:
   - fixes chat with contacts who have non-ASCII User Mood string