summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-12-11 02:16:15 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-12-11 19:36:34 +0100
commite00435be5c63396933259ef554dc02a1cbf74f31 (patch)
tree5c84ec0156a4fa40b85cc30a2ea557937d3ecaac
parent7542bb6bd597400167da57dc43dd37ff85a6e173 (diff)
downloadtdenetwork-e00435be5c63396933259ef554dc02a1cbf74f31.tar.gz
tdenetwork-e00435be5c63396933259ef554dc02a1cbf74f31.zip
kopete: Change the default MSN server from messenger.hotmail.com
to m1.escargot.log1p.xyz. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fb65b9de0f886566151420f92f96b175ef1309c0)
-rw-r--r--kopete/protocols/msn/msnaccount.cpp2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp2
-rw-r--r--kopete/protocols/msn/msnsecureloginhandler.cpp4
-rw-r--r--kopete/protocols/msn/msnsocket.cpp2
-rw-r--r--kopete/protocols/msn/ui/msneditaccountui.ui2
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.cpp4
6 files changed, 8 insertions, 8 deletions
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index c987bf1d..3f955f20 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -126,7 +126,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
TQString MSNAccount::serverName()
{
- return configGroup()->readEntry( "serverName" , "messenger.hotmail.com" );
+ return configGroup()->readEntry( "serverName" , "m1.escargot.log1p.xyz" );
}
uint MSNAccount::serverPort()
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index ec9b27c8..a575bf3f 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -627,7 +627,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
TQString hotmailRequest = "<html>\n"
"<head>\n"
"<noscript>\n"
- "<meta http-equiv=Refresh content=\"0; url=http://www.hotmail.com\">\n"
+ "<meta http-equiv=Refresh content=\"0; url=https://escargot.log1p.xyz/\">\n"
"</noscript>\n"
"</head>\n"
"<body onload=\"document.pform.submit(); \">\n"
diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp
index f8431f9f..936b88fc 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.cpp
+++ b/kopete/protocols/msn/msnsecureloginhandler.cpp
@@ -39,7 +39,7 @@ void MSNSecureLoginHandler::login()
{
// Retrive the login server.
// Do a reload and don't show the progress.
- TDEIO::Job *getLoginServer = TDEIO::get(KURL("https://nexus.passport.com/rdr/pprdr.asp"), true, false);
+ TDEIO::Job *getLoginServer = TDEIO::get(KURL("https://m1.escargot.log1p.xyz/nexus-mock"), true, false);
getLoginServer->addMetaData("cookies", "manual");
getLoginServer->addMetaData("cache", "reload");
@@ -56,7 +56,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob)
TQString httpHeaders = loginJob->queryMetaData("HTTP-Headers");
// Get the login URL using TQRegExp
- TQRegExp rx("PassportURLs: DARealm=(.*),DALogin=(.*),DAReg=");
+ TQRegExp rx("Passporturls: DARealm=(.*),DALogin=(.*),DAReg=");
rx.search(httpHeaders);
// Set the loginUrl and loginServer
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index 2bb33c97..11fdfcf8 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -894,7 +894,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp )
m_bIsFirstInTransaction = true;
m_pending = false;
m_remaining = 0;
- m_gateway = "gateway.messenger.hotmail.com";
+ m_gateway = "gateway.m1.escargot.log1p.xyz";
}
if ( m_onlineStatus != Disconnected )
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index 0a764c57..eed66736 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -1187,7 +1187,7 @@ Only works for emoticons in the PNG format.</string>
</sizepolicy>
</property>
<property name="text">
- <string>messenger.hotmail.com</string>
+ <string>m1.escargot.log1p.xyz</string>
</property>
<property name="toolTip" stdset="0">
<string>Only modify these values if you want to use a special IM proxy server, like SIMP</string>
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 41a007f9..958a156e 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -113,7 +113,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
//remove me after we can change account ids (Matt)
d->ui->m_login->setDisabled( true );
d->ui->m_autologin->setChecked( account->excludeConnect() );
- if ( ( static_cast<MSNAccount*>(account)->serverName() != "messenger.hotmail.com" ) || ( static_cast<MSNAccount*>(account)->serverPort() != 1863) ) {
+ if ( ( static_cast<MSNAccount*>(account)->serverName() != "m1.escargot.log1p.xyz" ) || ( static_cast<MSNAccount*>(account)->serverPort() != 1863) ) {
d->ui->optionOverrideServer->setChecked( true );
}
@@ -209,7 +209,7 @@ Kopete::Account * MSNEditAccountWidget::apply()
config->writeEntry( "serverPort", d->ui->m_serverPort->value() );
}
else {
- config->writeEntry( "serverName", "messenger.hotmail.com" );
+ config->writeEntry( "serverName", "m1.escargot.log1p.xyz" );
config->writeEntry( "serverPort", "1863" );
}