[gajim/f13/master] 0.14-4
Michal Schmidt
michich at fedoraproject.org
Tue Sep 21 17:51:35 UTC 2010
commit 355bbbb6b07da72bb3bd6126f78ad09ca1e97cf2
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Tue Sep 21 19:43:39 2010 +0200
0.14-4
use upstream gnome-keyring patch
fix a traceback with invalid iq:last reply
Conflicts:
gajim.spec
gajim-0.13.90-gnome-keyring-CancelledError.patch | 26 --------------------
...andle-canceling-of-creating-gnome-keyring.patch | 21 ++++++++++++++++
...k-when-receiving-strange-reply-to-iq_last.patch | 25 +++++++++++++++++++
gajim.spec | 12 +++++++--
4 files changed, 55 insertions(+), 29 deletions(-)
---
diff --git a/gajim-handle-canceling-of-creating-gnome-keyring.patch b/gajim-handle-canceling-of-creating-gnome-keyring.patch
new file mode 100644
index 0000000..2ce30da
--- /dev/null
+++ b/gajim-handle-canceling-of-creating-gnome-keyring.patch
@@ -0,0 +1,21 @@
+tree 6bbc5b769238
+parent 11dda9b52325
+author Yann Leboulanger <asterix at lagaule.org> 1284664512 -7200
+committer Yann Leboulanger <asterix at lagaule.org> 1284664512 -7200
+revision 12413
+branch default
+
+handle canceling of creating gnome keyring. Fixes #5909
+diff --git a/src/common/passwords.py b/src/common/passwords.py
+--- a/src/common/passwords.py
++++ b/src/common/passwords.py
+@@ -197,7 +197,8 @@
+ if USER_USES_GNOMEKEYRING:
+ try:
+ storage = GnomePasswordStorage()
+- except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError):
++ except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError,
++ gnomekeyring.CancelledError):
+ storage = None
+ if storage is None:
+ if gajim.config.get('use_kwalletcli'):
diff --git a/gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch b/gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch
new file mode 100644
index 0000000..51962f7
--- /dev/null
+++ b/gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch
@@ -0,0 +1,25 @@
+Fix a traceback seen with jabber.el 0.8.0 on the other side.
+
+Backported from upstream patch:
+
+tree 6a41bf99daa0
+parent 44a33a30bdd8
+author Yann Leboulanger <asterix at lagaule.org> 1284146830 -7200
+committer Yann Leboulanger <asterix at lagaule.org> 1284146830 -7200
+revision 12406
+branch default
+
+prevent traceback when receiving strange reply to iq:last. Fixes #5898
+Index: gajim-0.14/src/common/connection_handlers.py
+===================================================================
+--- gajim-0.14.orig/src/common/connection_handlers.py
++++ gajim-0.14/src/common/connection_handlers.py
+@@ -819,6 +819,8 @@ class ConnectionHandlersBase:
+ def _LastResultCB(self, con, iq_obj):
+ log.debug('LastResultCB')
+ qp = iq_obj.getTag('query')
++ if not qp:
++ return
+ seconds = qp.getAttr('seconds')
+ status = qp.getData()
+ try:
diff --git a/gajim.spec b/gajim.spec
index 03cc95f..5cb0986 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -2,15 +2,16 @@ Summary: Jabber client written in PyGTK
Name: gajim
%global majorver 0.14
Version: 0.14
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv3
Group: Applications/Internet
URL: http://gajim.org/
Source0: http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
-Patch0: gajim-0.13.90-gnome-keyring-CancelledError.patch
+Patch0: gajim-handle-canceling-of-creating-gnome-keyring.patch
+Patch1: gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch
# libasyncns triggers a kernel bug (RHBZ#529202), so let's not use it until
# it's fixed.
-Patch1: gajim-0.14-disable-libasyncns.patch
+Patch2: gajim-0.14-disable-libasyncns.patch
BuildArch: noarch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -64,6 +65,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%configure --docdir=%{_docdir}/%{name}-%{version}
@@ -121,6 +123,10 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/src
%changelog
+* Tue Sep 21 2010 Michal Schmidt <mschmidt at redhat.com> 0.14-4
+- Replace our gnome-keyring patch with one picked from upstream hg.
+- Prevent traceback when receiving strange reply to iq:last.
+
* Mon Sep 20 2010 Michal Schmidt <mschmidt at redhat.com> 0.14-3
- Require gstreamer-python too. (RHBZ#632927)
More information about the scm-commits
mailing list