rpms/jabbim/F-9 jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff, NONE, 1.1 jabbim.spec, 1.18, 1.19

[Michal Schmidt (michich)]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25501

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff 
Log Message:
* Tue Jun 24 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.1-3
- Add upstream patch to prevent initial message loss if sender's mood is empty.


jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff:

--- NEW FILE jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff ---
Initial message of a conversation can be lost if the sender's mood is empty.
This is a partial backport of upstream SVN change 2993.

Index: widgets/chatwidget.py
===================================================================
--- widgets/chatwidget.py	(revision 3030)
+++ widgets/chatwidget.py	(working copy)
@@ -341,7 +341,7 @@
 		mood = contact.getPEP('http://jabber.org/protocol/mood')
 		if mood != None:
 			t = ''
-			m = txt = ''
+			m = txt = icon = ''
 			for el in mood.elements():
 				if el.name == 'text':
 					txt = unicode(el)


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-9/jabbim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jabbim.spec	23 Jun 2008 11:41:15 -0000	1.18
+++ jabbim.spec	24 Jun 2008 11:47:22 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		jabbim
 Version:	0.4.1
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -13,6 +13,7 @@
 Source1:	jabbim.in
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 Patch1:		jabbim-0.4-tune-do-not-offer-Winamp.diff
+Patch2:		jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,6 +41,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
@@ -114,6 +116,9 @@
 
 
 %changelog
+* Tue Jun 24 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.1-3
+- Add upstream patch to prevent initial message loss if sender's mood is empty.
+
 * Mon Jun 23 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.1-1
 - Upstream bugfix release 0.4.1. Fixes:
   - archive now actually displays messages