From 6e76ea6798905b5afa5079133a957fbe93bac028 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 2 Nov 2012 12:02:09 -0500 Subject: Update kopete references of gaim to pidgin. This resolves bug report 865. Thanks to Kristopher Gamrat. --- kopete/protocols/oscar/liboscar/TODO | 2 +- kopete/protocols/oscar/liboscar/buddyicontask.cpp | 2 +- kopete/protocols/oscar/liboscar/chatnavservicetask.cpp | 2 +- kopete/protocols/oscar/liboscar/coreprotocol.cpp | 2 +- kopete/protocols/oscar/liboscar/sendmessagetask.cpp | 4 ++-- kopete/protocols/oscar/liboscar/userdetails.cpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kopete/protocols/oscar/liboscar') diff --git a/kopete/protocols/oscar/liboscar/TODO b/kopete/protocols/oscar/liboscar/TODO index 1ec9be98..ed14e15e 100644 --- a/kopete/protocols/oscar/liboscar/TODO +++ b/kopete/protocols/oscar/liboscar/TODO @@ -17,7 +17,7 @@ Misc. Before Merge things Direct Connections ==================================== When/If we get around to it. Matt knows absolutely nothing about direct connections and the only online source of documentation is no longer online. :( -This will definately be one of those things we have to dissect gaim for. :/ +This will definately be one of those things we have to dissect pidgin for. :/ SNAC 0x15 parsing diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.cpp b/kopete/protocols/oscar/liboscar/buddyicontask.cpp index c75a592b..c7661481 100644 --- a/kopete/protocols/oscar/liboscar/buddyicontask.cpp +++ b/kopete/protocols/oscar/liboscar/buddyicontask.cpp @@ -137,7 +137,7 @@ void BuddyIconTask::sendIcon() m_seq = client()->snacSequence(); SNAC s = { 0x0010, 0x0002, 0x0000, m_seq }; Buffer* b = new Buffer; - b->addWord( 1 ); //gaim hard codes it, so will we + b->addWord( 1 ); //pidgin hard codes it, so will we b->addWord( m_iconLength ); b->addString( m_icon ); Transfer* t = createTransfer( f, s, b ); diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp index 3004af0c..4a34ae2f 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp @@ -115,7 +115,7 @@ void ChatNavServiceTask::onGo() void ChatNavServiceTask::createRoom( WORD exchange, const TQString& name ) { - //most of this comes from gaim. thanks to them for figuring it out + //most of this comes from pidgin. thanks to them for figuring it out TQString cookie = "create"; //hardcoded, seems to be ignored by AOL TQString lang = "en"; TQString charset = "us-ascii"; diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp index 2a4d96f5..e3c26420 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp @@ -7,7 +7,7 @@ Based on code Copyright (c) 2004 SuSE Linux AG http://www.suse.com Based on Iris, Copyright (C) 2003 Justin Karneges - url_escape_string from Gaim src/protocols/novell/nmconn.c + url_escape_string from Pidgin src/protocols/novell/nmconn.c Copyright (c) 2004 Novell, Inc. All Rights Reserved Kopete (c) 2002-2004 by the Kopete developers diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp index 1b8cbfbc..df1a8193 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp @@ -141,7 +141,7 @@ void SendMessageTask::addChannel1Data( Buffer* b ) { Buffer tlv2buffer; - //Send features TLV using data from gaim. Features are different + //Send features TLV using data from pidgin. Features are different //depending on whether we're ICQ or AIM if ( client()->isIcq() ) { @@ -266,7 +266,7 @@ void SendMessageTask::addRendezvousMessageData( Buffer* b ) b->addLEWord( 0x001B ); // length of this data segment, always 27 // protocol version - // miranda,licq use 8, gaim,icq5 use 9, icq2003b uses 10. + // miranda,licq use 8, pidgin,icq5 use 9, icq2003b uses 10. // 9 seems to make things a litle difficult, 10 seems a little more like 8, but still more difficult b->addLEWord( 0x0008 ); // so stick with 8 for now :) diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp index 8a1b6c4e..f8737026 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.cpp +++ b/kopete/protocols/oscar/liboscar/userdetails.cpp @@ -363,7 +363,7 @@ void UserDetails::detectClient() clientMatched=true; // default case will set it to false again if we did not find anything switch (m_dcLastInfoUpdateTime) { - case 0xFFFFFFFFL: //gaim behaves like official AIM so we can't detect them, only look for miranda + case 0xFFFFFFFFL: //pidgin behaves like official AIM so we can't detect them, only look for miranda { if (m_dcLastExtStatusUpdateTime & 0x80000000) m_clientName=TQString::fromLatin1("Miranda alpha"); @@ -439,9 +439,9 @@ void UserDetails::detectClient() m_clientName=TQString::fromLatin1("ICQ2go"); } } - else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ + else if (hasCap(CAP_BUDDYICON)) // only pidgin seems to advertize this on ICQ { - m_clientName = TQString::fromLatin1("Gaim"); + m_clientName = TQString::fromLatin1("Pidgin"); } else if (hasCap(CAP_XTRAZ)) { -- cgit v1.2.1