[SCM] kmess packaging branch, master, updated. debian/2.0.2-1-20-gae1fa5f

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit a5cf0f47ae20eb339cc82e9ad62251bd0c13dea8
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Nov 9 14:49:27 2011 +0100

    Add follow-location-redirects.diff
---
 debian/changelog                              |    2 +
 debian/patches/follow-location-redirects.diff |   36 +++++++++++++++++++++++++
 debian/patches/series                         |    1 +
 3 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c83e0f..655bd5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kmess (2.0.6.1-2) UNRELEASED; urgency=low
 
+  * Add follow-location-redirects.diff, this makes KMess usable with the latest
+    changes in MSN servers. (Closes: #648080)
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 09 Nov 2011 14:28:58 +0100
 
diff --git a/debian/patches/follow-location-redirects.diff b/debian/patches/follow-location-redirects.diff
new file mode 100644
index 0000000..3bd50ab
--- /dev/null
+++ b/debian/patches/follow-location-redirects.diff
@@ -0,0 +1,36 @@
+Author: Peter Lekensteyn <lekensteyn at gmail.com>
+Origin: http://kmess.org/board/viewtopic.php?f=4&t=20549&start=15#p32892
+Desciption: Follow Location redirects, MS seems to have moved some accounts to
+ other servers. Forum topic reference:
+ Connection problem to wlm - http://kmess.org/board/viewtopic.php?f=4&t=20549
+diff -Nur a/src/network/soap/httpsoapconnection.cpp b/src/network/soap/httpsoapconnection.cpp
+--- a/src/network/soap/httpsoapconnection.cpp	2011-02-16 08:16:45.000000000 +0100
++++ b/src/network/soap/httpsoapconnection.cpp	2011-11-08 16:53:29.612517607 +0100
+@@ -456,6 +456,7 @@
+   const QByteArray& replyContents = reply->readAll();
+   const int         statusCode    = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute   ).toInt();
+   const QString     error         ( reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ).toString() );
++  QUrl redirectUrl = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
+ 
+ #ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
+   bool requestSuccess = false;
+@@ -490,13 +491,16 @@
+ #endif
+ 
+     // Parse the message contents
+-    if( currentResponse->isFaultMessage() )
++    if( !redirectUrl.isEmpty() || currentResponse->isFaultMessage() )
+     {
+-      // Verify if the server is redirecting us to another server
+       if( currentResponse->getFaultCode() == "psf:Redirect" )
+       {
++        redirectUrl = XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" );
++      }
++      // Verify if the server is redirecting us to another server
++      if( !redirectUrl.isEmpty() )
++      {
+         const QUrl& originalUrl = currentResponse->getEndPoint();
+-        const QUrl redirectUrl( XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" ) );
+         const QString originalHost( originalUrl.host() );
+         const QString redirectHost( redirectUrl.host() );
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eb24d19
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+follow-location-redirects.diff

-- 
kmess packaging