rpms/jabbim/F-11 jabbim-0.5-fix-message-loss.diff, NONE, 1.1 jabbim.spec, 1.33, 1.34
Michal Schmidt
michich at fedoraproject.org
Thu Sep 10 18:05:11 UTC 2009
Author: michich
Update of /cvs/pkgs/rpms/jabbim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5742
Modified Files:
jabbim.spec
Added Files:
jabbim-0.5-fix-message-loss.diff
Log Message:
* Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
- Fix message loss because of a change in PyQt4 4.5.x.
(jabbim-0.5-fix-message-loss.diff, committed upstream)
jabbim-0.5-fix-message-loss.diff:
jabbim.py | 8 --------
1 file changed, 8 deletions(-)
--- NEW FILE jabbim-0.5-fix-message-loss.diff ---
commit 5959b46fc6ace41885092f0dda6cbbeb34685fd8
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date: Thu Sep 10 17:12:14 2009 +0000
fix message loss with PyQt4 4.5.x
In PyQt4 4.5 concatenating QString with unicode no longer works.
This manifests itself by a traceback when receiving an initial message
from a contact with non-ASCII name in roster. The message is thus lost.
The traceback occurs in computing the value of a variable that is not
even used.
git-svn-id: svn://dev.jabbim.cz/jabbim/trunk@4225 4aba8365-6129-0410-a408-ea17bd48e33e
diff --git a/jabbim.py b/jabbim.py
index 1c7e80e..9bf50bc 100644
--- a/jabbim.py
+++ b/jabbim.py
@@ -1793,14 +1793,6 @@ class clientClass(pyxl.client.Client):
traytext=body[:40]+" ..."
else:
traytext=body
- text='<table><tr>'
- #if len(self.main.ui.roster.getUserItems(frm.userhost()))>0 and os.path.isfile(self.main.homeDir+'/avatars/'+unicode(frm.userhost())):
- #item=self.main.ui.roster.getUserItems(frm.userhost())[0]
- #pixmap=item.avatar.pixmap(64,64)
- #text+='<td><img src="'+self.main.homeDir+'/avatars/'+unicode(item.jid)+'" width="'+str(pixmap.width())+'" height="'+str(pixmap.height())+'"/></td>'
- text+='<td><b>'+mainWindow.tr("New message from ")+unicode(user)+'</b><br/>'
- text+='<font size="-1">'+traytext+'<br/>'
- text+="</td></tr></table>"
if self.groupchats.has_key(frm.userhost()):
self.main.chat.addChatTab(frm.full(),unicode(user),icon,True,full=True)
tab,tabIndex=self.main.chat.findTab(frm.full(),True)
Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/jabbim.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- jabbim.spec 8 Sep 2009 07:41:51 -0000 1.33
+++ jabbim.spec 10 Sep 2009 18:05:11 -0000 1.34
@@ -2,7 +2,7 @@
%global svndate 20090907
Name: jabbim
Version: 0.5
-Release: 0.8.svn%{svndate}%{?dist}
+Release: 0.9.svn%{svndate}%{?dist}
Summary: Jabber client for mere mortals
Group: Applications/Internet
@@ -14,6 +14,7 @@ URL: http://dev.jabbim.cz/jabbim
Source0: jabbim-svn%{svndate}.tar.xz
Patch0: jabbim-0.4-autoupdate-disable-notification.diff
Patch1: jabbim-0.5-fix-compact-roster-drawing.diff
+Patch2: jabbim-0.5-fix-message-loss.diff
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +44,7 @@ with the advanced functionality provided
%setup -q -n jabbim-svn%{svndate}
%patch0 -p1
%patch1 -p1
+%patch2 -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}%{?dist}'#" jabbim.py
@@ -98,6 +100,10 @@ fi
%changelog
+* Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
+- Fix message loss because of a change in PyQt4 4.5.x.
+ (jabbim-0.5-fix-message-loss.diff, committed upstream)
+
* 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)
More information about the fedora-extras-commits
mailing list