[Pkg-kde-commits] rev 1082 - in trunk/packages/kdenetwork/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-05-19 19:57:15 +0000 (Thu, 19 May 2005)
New Revision: 1082

Removed:
   trunk/packages/kdenetwork/debian/patches/12_kopete-non-dot-com-domains.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff
Log:
Haha, I'm dumb or something. The non-dot-com-domains patch applies to a
chunk of code that is removed by the other patch, so either we'll get
#306845 fixed for free, or upstream bug #96304 should be reopened. I'm
investigating a bit in #kopete.


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2005-05-19 19:41:02 UTC (rev 1081)
+++ trunk/packages/kdenetwork/debian/changelog	2005-05-19 19:57:15 UTC (rev 1082)
@@ -9,10 +9,12 @@
     Backported patch from upstream 3.4 SVN branch that introduces a new login
     handler stolen from KMess.
 
-  * Kopete is now able to log into MSN Messenger accounts with Hotmail or MSN
-    addresses that have a non-.com TLD (e.g., hotmail.co.uk) (Closes: #306845)
+  * As a result of the above new login handler, Kopete is now able to log into
+    MSN Messenger accounts with Hotmail or MSN addresses that have a non-.com
+    TLD (e.g., hotmail.co.uk), which closes: #306845. (The patch at upstream
+    bug #96304 is now obsolete.)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 May 2005 21:31:56 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 May 2005 21:55:54 +0200
 
 kdenetwork (4:3.3.2-3) unstable; urgency=high
 

Modified: trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff	2005-05-19 19:41:02 UTC (rev 1081)
+++ trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff	2005-05-19 19:57:15 UTC (rev 1082)
@@ -92,9 +92,9 @@
 +			QObject::connect( m_sslLoginHandler, SIGNAL(    loginSucceeded(QString) ),
 +					 this,            SLOT  ( sslLoginSucceeded(QString) ) );
  
--			if( m_account->accountId().contains("@hotmail.") )
+-			if( m_account->accountId().contains("@hotmail.com") )
 -				m_sid="loginnet.passport.com";
--			else if( m_account->accountId().contains("@msn.") ||  m_account->accountId().contains("@compaq.net") ||  m_account->accountId().contains("@webtv.net") )
+-			else if( m_account->accountId().contains("@msn.com") ||  m_account->accountId().contains("@compaq.net") ||  m_account->accountId().contains("@webtv.net") )
 -				m_sid="msnialogin.passport.com";
 -			else
 -				m_sid="login.passport.com";

Deleted: trunk/packages/kdenetwork/debian/patches/12_kopete-non-dot-com-domains.diff