[gajim] Fix connecting to non-SSL servers (#953243)

[Michal Schmidt]

commit 73a05c24e6251f277132a1488e59eebf38f2e76f
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Apr 22 11:07:54 2013 +0200

    Fix connecting to non-SSL servers (#953243)
    
    - Fix connecting to non-SSL servers (#953243)
    - Remove unused patch files.

 gajim-0.15-13759-bac8e353d25c.patch   |   32 ---
 gajim-0.15-13761-f6f78f3802c0.patch   |   26 --
 gajim-0.15-13766-f046e4aaf7d4.patch   |  148 ------------
 gajim-0.15-farstream.patch            |  412 ---------------------------------
 gajim-0.15.3-14476-17df4ebe8da8.patch |   19 ++
 gajim.spec                            |   10 +-
 6 files changed, 28 insertions(+), 619 deletions(-)
---
diff --git a/gajim-0.15.3-14476-17df4ebe8da8.patch b/gajim-0.15.3-14476-17df4ebe8da8.patch
new file mode 100644
index 0000000..0d6873a
--- /dev/null
+++ b/gajim-0.15.3-14476-17df4ebe8da8.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Yann Leboulanger <asterix at lagaule.org>
+# Date 1363696323 -3600
+# Node ID 17df4ebe8da82f26e0b1dc0745b278c4c6b30dc6
+# Parent  02c9c6e7c02b684f6654a76967bb0a58d4709d9f
+don't traceback when server doesn't have SSL support. Fixes #7322
+
+diff --git a/src/common/connection.py b/src/common/connection.py
+--- a/src/common/connection.py
++++ b/src/common/connection.py
+@@ -1328,7 +1328,7 @@
+                     certificate=con.Connection.ssl_certificate[i]))
+                 return True
+             i += 1
+-        if hasattr(con.Connection, 'ssl_fingerprint_sha1'):
++        if con.Connection.ssl_fingerprint_sha1:
+             saved_fingerprint = gajim.config.get_per('accounts', self.name,
+                 'ssl_fingerprint_sha1')
+             if saved_fingerprint:
diff --git a/gajim.spec b/gajim.spec
index 25d0110..46db715 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -2,13 +2,16 @@ Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.15
 Version:	0.15.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
 BuildArch:	noarch
 
+# bz#953243 - Gajim IndexError: list index out of range
+Patch0001:	gajim-0.15.3-14476-17df4ebe8da8.patch
+
 Requires:	avahi-ui-tools
 # for NSLookupResolver; a fallback when libasyncns does not work
 Requires:	bind-utils
@@ -58,6 +61,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -112,6 +116,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/src
 
 %changelog
+* Mon Apr 22 2013 Michal Schmidt <mschmidt at redhat.com> - 0.15.3-3
+- Fix connecting to non-SSL servers (#953243).
+- Remove unused patch files.
+
 * Mon Apr 08 2013 Jon Ciesla <limburgher at gmail.com> - 0.15.3-2
 - Drop desktop vendor tag.