Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q*

This fixes the Kopete MSN protocol among other things


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 46224eafb0
commit 5ab9dadace

@ -37,7 +37,7 @@ void Engine::bindCommands()
bind("PING", this, TQT_SLOT(ping(KIRC::Message &)), 0, 0);
bind("PONG", this, TQT_SLOT(pong(KIRC::Message &)), 0, 0);
bind("PRIVMSG", this, TQT_SLOT(privmsg(KIRC::Message &)), 1, 1);
bind("TQUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0);
bind("QUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0);
// bind("STQUIT", this, TQT_SLOT(squit(KIRC::Message &)), 1, 1);
bind("TOPIC", this, TQT_SLOT(topic(KIRC::Message &)), 1, 1);
}
@ -199,7 +199,7 @@ void Engine::quit(const TQString &reason, bool /*now*/)
return;
if (isConnected())
writeMessage("TQUIT", TQString(), reason);
writeMessage("QUIT", TQString(), reason);
settqStatus(Closing);
}

@ -541,7 +541,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
m_challengeHandler = new MSNChallengeHandler("CFHUR$52U_{VIX5T", "PROD0101{0RM?UBW");
// Compute the challenge response hash, and send the response.
TQString chlResponse = m_challengeHandler->computeHash(data.section(' ', 0, 0));
sendCommand("TQRY", m_challengeHandler->productId(), true, chlResponse.utf8());
sendCommand("QRY", m_challengeHandler->productId(), true, chlResponse.utf8());
// Dispose of the challenge handler.
m_challengeHandler->deleteLater();
m_challengeHandler = 0L;
@ -592,11 +592,11 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
else //FROM SYN
m_account->configGroup()->writeEntry( "BLP" , data.section( ' ', 0, 0 ) );
}
else if( cmd == "TQRY" )
else if( cmd == "QRY" )
{
// Do nothing
}
else if( cmd == "TQNG" )
else if( cmd == "QNG" )
{
//this is a reply from a ping
m_ping=false;

@ -143,31 +143,31 @@ static int probe_otalk_packet(char *buf, size_t len, size_t maxlen,
ktalk_debug("Probing for TQUIRK_OTALK\n");
if (sizeof(otp)!=OTALK_PACKET_SIZE) {
syslog(LOG_ERR, "TQUIRK_OTALK: struct otalk_packet padding "
syslog(LOG_ERR, "QUIRK_OTALK: struct otalk_packet padding "
"is wrong\n");
return -1;
}
if (len!=sizeof(otp)) {
ktalk_debug("TQUIRK_OTALK: wrong size\n");
ktalk_debug("QUIRK_OTALK: wrong size\n");
return -1;
}
memcpy(&otp, buf, len);
if (probe_string(otp.l_name, sizeof(otp.l_name))) {
ktalk_debug("TQUIRK_OTALK: l_name not a string\n");
ktalk_debug("QUIRK_OTALK: l_name not a string\n");
return -1;
}
if (probe_string(otp.r_name, sizeof(otp.r_name))) {
ktalk_debug("TQUIRK_OTALK: r_name not a string\n");
ktalk_debug("QUIRK_OTALK: r_name not a string\n");
return -1;
}
if (probe_string(otp.r_tty, sizeof(otp.r_tty))) {
ktalk_debug("TQUIRK_OTALK: r_tty not a string\n");
ktalk_debug("QUIRK_OTALK: r_tty not a string\n");
return -1;
}
if (probe_addr(&otp.ctl_addr, sn)) {
ktalk_debug("TQUIRK_OTALK: addresses do not match\n");
ktalk_debug("QUIRK_OTALK: addresses do not match\n");
return -1;
}
@ -182,17 +182,17 @@ static int probe_otalk_packet(char *buf, size_t len, size_t maxlen,
case OLD_AUTO_LOOK_UP: otp.type = LOOK_UP; break;
case OLD_AUTO_DELETE: otp.type = DELETE; break;
default:
ktalk_debug("TQUIRK_OTALK: invalid type field\n");
ktalk_debug("QUIRK_OTALK: invalid type field\n");
return -1;
}
if (OLD_NAME_SIZE >= NAME_SIZE) {
syslog(LOG_ERR, "TQUIRK_OTALK: OLD_NAME_SIZE >= NAME_SIZE\n");
syslog(LOG_ERR, "TQUIRK_OTALK: fix repairs.c and recompile\n");
syslog(LOG_ERR, "QUIRK_OTALK: OLD_NAME_SIZE >= NAME_SIZE\n");
syslog(LOG_ERR, "QUIRK_OTALK: fix repairs.c and recompile\n");
return -1;
}
if (maxlen < sizeof(CTL_MSG)) {
syslog(LOG_ERR, "TQUIRK_OTALK: maxlen too small; enlarge "
syslog(LOG_ERR, "QUIRK_OTALK: maxlen too small; enlarge "
"inbuf[] in talkd.c and recompile\n");
return -1;
}
@ -219,7 +219,7 @@ static size_t do_otalk_reply(char *buf, size_t maxlen) {
struct otalk_reply or;
CTL_RESPONSE *r = (CTL_RESPONSE *)buf;
if (sizeof(or) > maxlen) {
syslog(LOG_ERR, "TQUIRK_OTALK: reply: maxlen too small; "
syslog(LOG_ERR, "QUIRK_OTALK: reply: maxlen too small; "
"enlarge buf[] in send_packet and recompile\n");
return sizeof(CTL_RESPONSE);
}

Loading…
Cancel
Save