[gajim] Update gnome-keyring patch

[Michal Schmidt]

commit 977ba2adca250d1b9c46127e19a98b318614144d
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Thu Aug 19 23:03:40 2010 +0200

    Update gnome-keyring patch
    
    + update changelog

 gajim-0.13.3-gnome-keyring-CancelledError.patch  |   23 -------------------
 gajim-0.13.90-gnome-keyring-CancelledError.patch |   26 ++++++++++++++++++++++
 gajim.spec                                       |    8 +++---
 3 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/gajim-0.13.90-gnome-keyring-CancelledError.patch b/gajim-0.13.90-gnome-keyring-CancelledError.patch
new file mode 100644
index 0000000..b93dfd8
--- /dev/null
+++ b/gajim-0.13.90-gnome-keyring-CancelledError.patch
@@ -0,0 +1,26 @@
+Newer gnome-keyring may raise CancelledError
+
+In such case let's continue without the keyring instead of crashing.
+
+
+  Patch attached to upstream trac ticket:
+  http://trac.gajim.org/ticket/5633
+  https://bugzilla.redhat.com/show_bug.cgi?id=556374
+    -- Michal
+
+Update 2010-08-19:
+I'm seeing IOError, perhaps because of a gnome-keyring bug. Added.
+
+Index: gajim-0.13.90/src/common/passwords.py
+===================================================================
+--- gajim-0.13.90.orig/src/common/passwords.py
++++ gajim-0.13.90/src/common/passwords.py
+@@ -197,7 +197,7 @@ def get_storage():
+         if USER_USES_GNOMEKEYRING:
+             try:
+                 storage = GnomePasswordStorage()
+-            except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError):
++            except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, gnomekeyring.CancelledError, gnomekeyring.IOError):
+                 storage = None
+         if storage is None:
+             if gajim.config.get('use_kwalletcli'):
diff --git a/gajim.spec b/gajim.spec
index 43aa172..483d1b7 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -7,7 +7,7 @@ License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
-#Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
+Patch0:		gajim-0.13.90-gnome-keyring-CancelledError.patch
 Patch1:		gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
 BuildArch:	noarch
 
@@ -57,7 +57,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 
 %prep
 %setup -q
-#% patch0 -p1
+%patch0 -p1
 %patch1 -p1
 
 %build
@@ -115,9 +115,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Thu Aug 19 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.90-1
 - Update to 0.13.90 (a.k.a. 0.14 beta1)
 - Icon cache handling.
-- Needs avahi-ui-tools for zeroconf support.
+- Cleanups and fixes of Requires.
 - Refresh pygtk crash patch.
-- Skip gnome-keyring patch for now.
+- Update gnome-keyring patch.
 - Remove now unnecessary declaration and cleaning of BuildRoot.
 
 * Tue Aug 10 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.4-2