Archives
Archives
| From: | "Samuli Suominen (ssuominen)" <ssuominen@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in kde-base/kdepimlibs/files: kdepimlibs-4.4.0-sieve.patch |
| Date: | Wed, 24 Feb 2010 09:38:25 |
| Message-Id: | E1NkDhD-0006hQ-Ry@stork.gentoo.org |
| 1 | ssuominen 10/02/24 09:38:19 |
| 2 | |
| 3 | Added: kdepimlibs-4.4.0-sieve.patch |
| 4 | Log: |
| 5 | Apply patch from upstream trunk for Sieve script editing wrt #305211, thanks to Martin Regner and Andreas K. Huettel. |
| 6 | (Portage version: 2.2_rc63/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 kde-base/kdepimlibs/files/kdepimlibs-4.4.0-sieve.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdepimlibs/files/kdepimlibs-4.4.0-sieve.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdepimlibs/files/kdepimlibs-4.4.0-sieve.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: kdepimlibs-4.4.0-sieve.patch |
| 15 | =================================================================== |
| 16 | http://bugs.kde.org/show_bug.cgi?id=212951 |
| 17 | http://bugs.gentoo.org/show_bug.cgi?id=305211 |
| 18 | |
| 19 | --- kioslave/sieve/sieve.cpp |
| 20 | +++ kioslave/sieve/sieve.cpp |
| 21 | @@ -364,12 +364,11 @@ |
| 22 | } |
| 23 | |
| 24 | // FIXME find a test server and test that this works |
| 25 | - // TODO ask the system whether SSL is available |
| 26 | - if (useTLSIfAvailable && QSslSocket::supportsSsl()) { |
| 27 | + if (useTLSIfAvailable && m_supportsTLS && QSslSocket::supportsSsl()) { |
| 28 | sendData("STARTTLS"); |
| 29 | if (operationSuccessful()) { |
| 30 | ksDebug << "TLS has been accepted. Starting TLS..." << endl |
| 31 | - << "WARNING this is untested and may fail."; |
| 32 | + << "WARNING this is untested and may fail."; |
| 33 | if (startSsl()) { |
| 34 | ksDebug << "TLS enabled successfully." << endl; |
| 35 | // reparse capabilities: |