Update kopete references of gaim to pidgin.

This resolves bug report 865.
Thanks to Kristopher Gamrat.
pull/1/head
Darrell Anderson 12 years ago
parent 3144ada216
commit 6e76ea6798

@ -143,7 +143,7 @@
* Rearrange the yahoo message parsing a bit so we do it all before we
create the KopeteMessage object for it.
Workaround gaim's bugginess when sending URLs so that there
Workaround pidgin's bugginess when sending URLs so that there
aren't parse errors. (#87190)
2004-08-14 14:22 Matt Rogers <matt.rogers@kdemail.net>

@ -5,7 +5,7 @@
Based on Testbed
Copyright (c) 2003 by Will Stephenson <will@stevello.free-online.co.uk>
rtfizeTest from nm_rtfize_text, from Gaim src/protocols/novell/nmuser.c
rtfizeTest from nm_rtfize_text, from Pidgin src/protocols/novell/nmuser.c
Copyright (c) 2004 Novell, Inc. All Rights Reserved
Kopete (c) 2002-2003 by the Kopete developers <kopete-devel@kde.org>
@ -178,7 +178,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
"{\\colortbl ;\\red0\\green0\\blue0;}\n"
"\\uc1\\cf1\\f0\\fs18 %1\\par\n}");
TQString outputText; // output text
TQCString plainUtf8 = plain.utf8(); // encoded as UTF8, because that's what this encoding algorithm, taken from Gaim's Novell plugin
TQCString plainUtf8 = plain.utf8(); // encoded as UTF8, because that's what this encoding algorithm, taken from Pidgin's Novell plugin
uint index = 0; // current char to transcode
while ( index < plainUtf8.length() )
{

@ -5,7 +5,7 @@
Based on Testbed
Copyright (c) 2003 by Will Stephenson <will@stevello.free-online.co.uk>
rtfizeTest from nm_rtfize_text, from Gaim src/protocols/novell/nmuser.c
rtfizeTest from nm_rtfize_text, from Pidgin src/protocols/novell/nmuser.c
Copyright (c) 2004 Novell, Inc. All Rights Reserved
Kopete (c) 2002-2003 by the Kopete developers <kopete-devel@kde.org>

@ -5,7 +5,7 @@
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 <kopete-devel@kde.org>
@ -273,11 +273,11 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
TQDataStream dout( bytesOut, IO_WriteOnly );
dout.setByteOrder( TQDataStream::LittleEndian );
// these fields are ignored by Gaim's novell
// these fields are ignored by Pidgin's novell
if ( field->type() == NMFIELD_TYPE_BINARY || field->method() == NMFIELD_METHOD_IGNORE )
continue;
// GAIM writes these tags to the secure socket separately - if we can't connect, check here
// PIDGIN writes these tags to the secure socket separately - if we can't connect, check here
// NM Protocol 1 writes them in an apparently arbitrary order
// tag
//dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) );

@ -177,7 +177,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
case ContactAdd: //104
case ReceiveFile: //109
case ConferenceRename: //116
// unhandled because unhandled in Gaim
// unhandled because unhandled in Pidgin
break;
/* GW7 */
case ReceivedBroadcast: //122

@ -4,7 +4,7 @@
Copyright (c) 2004 SUSE Linux AG http://www.suse.com
Based on Iris, Copyright (C) 2003 Justin Karneges
encode_method from Gaim src/protocols/novell/nmconn.c
encode_method from Pidgin src/protocols/novell/nmconn.c
Copyright (c) 2004 Novell, Inc. All Rights Reserved
Kopete (c) 2002-2004 by the Kopete developers <kopete-devel@kde.org>

@ -35,7 +35,7 @@ void GetStatusTask::userDN( const TQString & dn )
m_userDN = dn;
// set up Transfer
Field::FieldList lst;
// changed from USERID to DN as per Gaim/GWIM
// changed from USERID to DN as per Pidgin/GWIM
lst.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, m_userDN ) );
createTransfer( "getstatus", lst );
}

@ -31,7 +31,7 @@ SendMessageTask::~SendMessageTask()
void SendMessageTask::message( const TQStringList & recipientDNList, const OutgoingMessage & msg )
{
// Assumes the conference is instantiated, unlike Gaim's nm_send_message
// Assumes the conference is instantiated, unlike Pidgin's nm_send_message
Field::FieldList lst, tmp, msgBodies;
// list containing GUID
tmp.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, msg.guid ) );

@ -287,7 +287,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat
TQString xhtmlBody = message.escapedBody();
// According to JEP-0071 8.9 it is only RECOMMANDED to replace \n with <br/>
// which mean that some implementation (gaim 2 beta) may still think that \n are linebreak.
// which mean that some implementation (pidgin 2 beta) may still think that \n are linebreak.
// and considered the fact that KTextEditor generate a well indented XHTML, we need to remove all \n from it
// see Bug 121627
// Anyway, theses client that do like that are *WRONG* considreded the example of jep-71 where there are lot of

@ -119,7 +119,7 @@ public:
status_.find("Auto Status") != std::string::npos)
return STR_EMPTY;
}
if (jid_.resource().find("Gaim") != std::string::npos) {
if (jid_.resource().find("Pidgin") != std::string::npos) {
if (status_ == "Sorry, I ran out for a bit!")
return STR_EMPTY;
}

@ -9,7 +9,7 @@ To INSTALL
installing libmeanwhile
=======================
from http://meanwhile.sf.net - use version 0.3
Refer to INSTALL in the meanwhile code. Run configure without specifying the --with_gaim_src
Refer to INSTALL in the meanwhile code. Run configure without specifying the --with_pidgin_src
# autogen.sh
# ./configure --prefix=/usr
# make

@ -23,7 +23,7 @@ release:
internally a group ID is used. Kopete currently uses the name as a unique
identifier, however, and will likely get a bit confused by this. If you
do experience problems, you could join both groups using another MSN
client, like the official client, Trillian or Gaim as a workaround.
client, like the official client, Trillian or Pidgin as a workaround.
- Kopete contacts can be at Top-Level and in no groups. MSN doesn't
support this freature. The kopete's contact list can differe from server

@ -1178,7 +1178,7 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co
/**
* This code should open a chatwindow when a socket is open
* It has been disabled because gaim open switchboeard too often
* It has been disabled because pidgin open switchboeard too often
*
* the solution is to open the window only when the contact start typing
* see MSNChatSession::receivedTypingMsg

@ -695,7 +695,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
}
}
// User-Agent is not a official flag, but GAIM has it
// User-Agent is not a official flag, but PIDGIN has it
TQString UA;
if( config->readBoolEntry("SendClientInfo", true) )
{

@ -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

@ -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 );

@ -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";

@ -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 <kopete-devel@kde.org>

@ -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 :)

@ -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))
{

@ -4,10 +4,10 @@
* Some code copyright (C) 2002, Philip S Tellis <philip . tellis AT gmx . net>
*
* Much of this code was taken and adapted from the yahoo module for
* gaim released under the GNU GPL. This code is also released under the
* pidgin released under the GNU GPL. This code is also released under the
* GNU GPL.
*
* This code is derivitive of Gaim <http://gaim.sourceforge.net>
* This code is derivitive of Pidgin <http://pidgin.sourceforge.net>
* copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
* 1998-1999, Adam Fritzler <afritz@marko.net>
* 1998-2002, Rob Flynn <rob@marko.net>

@ -4,10 +4,10 @@
* Some code copyright (C) 2002, Philip S Tellis <philip . tellis AT gmx . net>
*
* Much of this code was taken and adapted from the yahoo module for
* gaim released under the GNU GPL. This code is also released under the
* pidgin released under the GNU GPL. This code is also released under the
* GNU GPL.
*
* This code is derivitive of Gaim <http://gaim.sourceforge.net>
* This code is derivitive of Pidgin <http://pidgin.sourceforge.net>
* copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
* 1998-1999, Adam Fritzler <afritz@marko.net>
* 1998-2002, Rob Flynn <rob@marko.net>

@ -1,5 +1,5 @@
/*
* gaim
* pidgin
*
* Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
* libfaim code copyright 1998, 1999 Adam Fritzler <afritz@auk.cx>

@ -1,5 +1,5 @@
/*
* gaim
* pidgin
*
* Copyright (C) 2003
*

@ -174,7 +174,7 @@ TQString YahooAccount::stripMsgColorCodes(const TQString& msg)
filteredMsg.replace( "\033[4m", "<u>" );
filteredMsg.replace( "\033[x4m", "</u>" );
//GAIM doesn't check for ^[[3m. Does this ever get sent?
//PIDGIN doesn't check for ^[[3m. Does this ever get sent?
filteredMsg.replace( "\033[3m", "<i>" );
filteredMsg.replace( "\033[x3m", "</i>" );

@ -15,4 +15,4 @@ add_subdirectory( Clean )
add_subdirectory( Clear )
add_subdirectory( Konqi )
add_subdirectory( Retropete )
add_subdirectory( Gaim )
add_subdirectory( Pidgin )

@ -1,4 +0,0 @@
style_DATA = Action.html Content.html NextContent.html
styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources/Incoming
EXTRA_DIST = $(style_DATA)

@ -1,4 +0,0 @@
style_DATA = No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css
styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources/Variants
EXTRA_DIST = $(style_DATA)

@ -1,2 +1,2 @@
SUBDIRS = Kopete Hacker Clean Clear Konqi Retropete Gaim
SUBDIRS = Kopete Hacker Clean Clear Konqi Retropete Pidgin

@ -4,4 +4,4 @@ http://www.adiumxtras.com/index.php?a=xtras&xtra_id=44
Modified justtext Style for Adium written by Huw Rowlands
http://www.adiumxtras.com/index.php?a=xtras&xtra_id=990
Modified Gaim Style for Kopete written by Thanos Kyritsis
Modified Pidgin Style for Kopete written by Thanos Kyritsis

@ -6,13 +6,13 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleGetInfoString</key>
<string>Gaim Kopete chat Style</string>
<string>Pidgin Kopete chat Style</string>
<key>CFBundleIdentifier</key>
<string>Kopete.Gaim.style</string>
<string>Kopete.Pidgin.style</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>1.0</string>
<key>CFBundleName</key>
<string>Gaim</string>
<string>Pidgin</string>
<key>CFBundlePackageType</key>
<string>KopeteChatStyle</string>
<key>DefaultBackgroundColor</key>

@ -15,4 +15,4 @@ add_subdirectory( Variants )
install( FILES
main.css Footer.html Header.html Status.html
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources )
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources )

@ -11,4 +11,4 @@
install( FILES
Action.html Content.html NextContent.html
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Incoming )
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Incoming )

@ -0,0 +1,4 @@
style_DATA = Action.html Content.html NextContent.html
styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources/Incoming
EXTRA_DIST = $(style_DATA)

@ -1,5 +1,5 @@
SUBDIRS = Incoming Outgoing Variants
style_DATA = main.css Footer.html Header.html Status.html
styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources
styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources
EXTRA_DIST = $(style_DATA)

@ -11,4 +11,4 @@
install( FILES
Action.html Content.html NextContent.html
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Outgoing )
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Outgoing )

@ -1,4 +1,4 @@
style_DATA = Action.html Content.html NextContent.html
styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources/Outgoing
styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources/Outgoing
EXTRA_DIST = $(style_DATA)

@ -11,4 +11,4 @@
install( FILES
No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Variants )
DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Variants )

@ -0,0 +1,4 @@
style_DATA = No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css
styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources/Variants
EXTRA_DIST = $(style_DATA)
Loading…
Cancel
Save