From 450ce2bfb8d3ea2c093fb9ff6df17b02b5719bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 10 Dec 2019 01:32:46 +0100
Subject: kopete: Change the default AIM server from login.oscar.aol.com to
 iwarg.ddns.net.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 24748270289583a17ed348baf0a21c28f700a5de)
---
 kopete/protocols/oscar/aim/aimaccount.cpp              | 4 ++--
 kopete/protocols/oscar/aim/ui/aimeditaccountui.ui      | 6 +++---
 kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index f6be26b7..4fbe472a 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -208,7 +208,7 @@ AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char
 	setMyself( mc );
 	myself()->setOnlineStatus( static_cast<AIMProtocol*>( parent )->statusOffline );
 	TQString profile = configGroup()->readEntry( "Profile",
-		i18n( "Visit the Kopete website at <a href=\"http://kopete.kde.org\">http://kopete.kde.org</a>") );
+		i18n( "Visit the Kopete website at <a href=\"http://trinitydesktop.org\">http://trinitydesktop.org</a>") );
 	mc->setOwnProfile( profile );
 
     m_joinChatDialog = 0;
@@ -759,7 +759,7 @@ void AIMAccount::connectWithPassword( const TQString & )
 
 	// Get the screen name for this account
 	TQString screenName = accountId();
-	TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) );
+	TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "iwarg.ddns.net" ) );
 	uint port = configGroup()->readNumEntry( "Port", 5190 );
 
 	Connection* c = setupConnection( server, port );
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
index c2ec9844..98932d9b 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
@@ -265,7 +265,7 @@
                                             <string>The IP address or hostmask of the AIM server you wish to connect to.</string>
                                         </property>
                                         <property name="whatsThis" stdset="0">
-                                            <string>The IP address or hostmask of the AIM server you wish to connect to.  Normally you will want the default (login.oscar.aol.com).</string>
+                                            <string>The IP address or hostmask of the AIM server you wish to connect to.  Normally you will want the default (iwarg.ddns.net).</string>
                                         </property>
                                     </widget>
                                     <widget class="TQLineEdit">
@@ -276,13 +276,13 @@
                                             <bool>false</bool>
                                         </property>
                                         <property name="text">
-                                            <string>login.oscar.aol.com</string>
+                                            <string>iwarg.ddns.net</string>
                                         </property>
                                         <property name="toolTip" stdset="0">
                                             <string>The IP address or hostmask of the AIM server you wish to connect to.</string>
                                         </property>
                                         <property name="whatsThis" stdset="0">
-                                            <string>The IP address or hostmask of the AIM server you wish to connect to.  Normally you will want the default (login.oscar.aol.com).</string>
+                                            <string>The IP address or hostmask of the AIM server you wish to connect to.  Normally you will want the default (iwarg.ddns.net).</string>
                                         </property>
                                     </widget>
                                     <widget class="TQLabel">
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
index e3c1f62b..da9b5d6d 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
@@ -40,9 +40,9 @@ AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *protocol,
 		//Remove me after we can change Account IDs (Matt)
 		mGui->edtAccountId->setDisabled( true );
 		mGui->mAutoLogon->setChecked( account->excludeConnect() );
-		TQString serverEntry = account->configGroup()->readEntry( "Server", "login.oscar.aol.com" );
+		TQString serverEntry = account->configGroup()->readEntry( "Server", "iwarg.ddns.net" );
 		int portEntry = account->configGroup()->readNumEntry( "Port", 5190 );
-		if ( serverEntry != "login.oscar.aol.com" || portEntry != 5190 )
+		if ( serverEntry != "iwarg.ddns.net" || portEntry != 5190 )
 			mGui->optionOverrideServer->setChecked( true );
 		else
 			mGui->optionOverrideServer->setChecked( false );
@@ -113,7 +113,7 @@ Kopete::Account *AIMEditAccountWidget::apply()
 	}
 	else
 	{
-		static_cast<OscarAccount *>( mAccount )->setServerAddress( "login.oscar.aol.com" );
+		static_cast<OscarAccount *>( mAccount )->setServerAddress( "iwarg.ddns.net" );
 		static_cast<OscarAccount *>( mAccount )->setServerPort( 5190 );
 	}
 
@@ -165,7 +165,7 @@ bool AIMEditAccountWidget::validateData()
 
 void AIMEditAccountWidget::slotOpenRegister()
 {
-	KRun::runURL( "http://my.screenname.aol.com/_cqr/login/login.psp?siteId=snshomepage&mcState=initialized&createSn=1", "text/html" );
+	KRun::runURL( "http://iwarg.ddns.net/aim/index.php?action=register", "text/html" );
 }
 
 #include "aimeditaccountwidget.moc"
-- 
cgit v1.2.1