summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kopete/ChangeLog2
-rw-r--r--kopete/protocols/groupwise/gwprotocol.cpp4
-rw-r--r--kopete/protocols/groupwise/gwprotocol.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp2
-rw-r--r--kopete/protocols/jabber/jabberchatsession.cpp2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h2
-rw-r--r--kopete/protocols/meanwhile/README2
-rw-r--r--kopete/protocols/msn/ReleaseNotes2
-rw-r--r--kopete/protocols/msn/msnaccount.cpp2
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/TODO2
-rw-r--r--kopete/protocols/oscar/liboscar/buddyicontask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/chatnavservicetask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/coreprotocol.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/sendmessagetask.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/userdetails.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/libyahoo.c4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/libyahoo.h4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoo_fn.c2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoo_fn.h2
-rw-r--r--kopete/protocols/yahoo/yahooaccount.cpp2
-rw-r--r--kopete/styles/CMakeLists.txt2
-rw-r--r--kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am4
-rw-r--r--kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am4
-rw-r--r--kopete/styles/Makefile.am2
-rw-r--r--kopete/styles/Pidgin/CMakeLists.txt (renamed from kopete/styles/Gaim/CMakeLists.txt)0
-rw-r--r--kopete/styles/Pidgin/CREDITS (renamed from kopete/styles/Gaim/CREDITS)2
-rw-r--r--kopete/styles/Pidgin/Contents/CMakeLists.txt (renamed from kopete/styles/Gaim/Contents/CMakeLists.txt)0
-rw-r--r--kopete/styles/Pidgin/Contents/Info.plist (renamed from kopete/styles/Gaim/Contents/Info.plist)6
-rw-r--r--kopete/styles/Pidgin/Contents/Makefile.am (renamed from kopete/styles/Gaim/Contents/Makefile.am)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt (renamed from kopete/styles/Gaim/Contents/Resources/CMakeLists.txt)2
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Footer.html0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Header.html0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html (renamed from kopete/styles/Gaim/Contents/Resources/Incoming/Action.html)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt (renamed from kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt)2
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html (renamed from kopete/styles/Gaim/Contents/Resources/Incoming/Content.html)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am4
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html (renamed from kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Makefile.am (renamed from kopete/styles/Gaim/Contents/Resources/Makefile.am)2
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html (renamed from kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt (renamed from kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt)2
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html (renamed from kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am (renamed from kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am)2
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html (renamed from kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Status.html (renamed from kopete/styles/Gaim/Contents/Resources/Status.html)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt (renamed from kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt)2
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css (renamed from kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am4
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css (renamed from kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css (renamed from kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css (renamed from kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css)0
-rw-r--r--kopete/styles/Pidgin/Contents/Resources/main.css (renamed from kopete/styles/Gaim/Contents/Resources/main.css)0
-rw-r--r--kopete/styles/Pidgin/Makefile.am (renamed from kopete/styles/Gaim/Makefile.am)0
57 files changed, 53 insertions, 53 deletions
diff --git a/kopete/ChangeLog b/kopete/ChangeLog
index 7c922c9f..626d0a77 100644
--- a/kopete/ChangeLog
+++ b/kopete/ChangeLog
@@ -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>
diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
index 68a31fb4..237122c6 100644
--- a/kopete/protocols/groupwise/gwprotocol.cpp
+++ b/kopete/protocols/groupwise/gwprotocol.cpp
@@ -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() )
{
diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h
index cc1b34fb..90e921c7 100644
--- a/kopete/protocols/groupwise/gwprotocol.h
+++ b/kopete/protocols/groupwise/gwprotocol.h
@@ -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>
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index 1041fb9c..64879548 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -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 ) );
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index 93ce7c92..75327064 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
@@ -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
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index f39c2ec7..1034b227 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -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>
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
index 2b77e33e..1ef621dc 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
@@ -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 );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
index fdf1173f..7180b4da 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
@@ -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 ) );
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index c18c9071..75bcdd03 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -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
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
index cab9312f..c6e63243 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
@@ -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;
}
diff --git a/kopete/protocols/meanwhile/README b/kopete/protocols/meanwhile/README
index 5c77dbf6..4730c3f6 100644
--- a/kopete/protocols/meanwhile/README
+++ b/kopete/protocols/meanwhile/README
@@ -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
diff --git a/kopete/protocols/msn/ReleaseNotes b/kopete/protocols/msn/ReleaseNotes
index 3a2b2f6a..1a36724a 100644
--- a/kopete/protocols/msn/ReleaseNotes
+++ b/kopete/protocols/msn/ReleaseNotes
@@ -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
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 6c4aa9cc..c4dcabf2 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -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
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 7d678760..3298e46e 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -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) )
{
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 <kopete-devel@kde.org>
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))
{
diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
index a97e7be7..b3a1f9f8 100644
--- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c
+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
@@ -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>
diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.h b/kopete/protocols/yahoo/libkyahoo/libyahoo.h
index b15f57aa..e9cad06e 100644
--- a/kopete/protocols/yahoo/libkyahoo/libyahoo.h
+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.h
@@ -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>
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c
index 56712898..72cebd2e 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c
+++ b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c
@@ -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>
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h
index c4b34c81..fc9d68e9 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h
@@ -1,5 +1,5 @@
/*
- * gaim
+ * pidgin
*
* Copyright (C) 2003
*
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 7cc330f2..a38feccb 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -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>" );
diff --git a/kopete/styles/CMakeLists.txt b/kopete/styles/CMakeLists.txt
index a98079ab..7a4653ef 100644
--- a/kopete/styles/CMakeLists.txt
+++ b/kopete/styles/CMakeLists.txt
@@ -15,4 +15,4 @@ add_subdirectory( Clean )
add_subdirectory( Clear )
add_subdirectory( Konqi )
add_subdirectory( Retropete )
-add_subdirectory( Gaim )
+add_subdirectory( Pidgin )
diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am
deleted file mode 100644
index dea28106..00000000
--- a/kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am
+++ /dev/null
@@ -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) \ No newline at end of file
diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am
deleted file mode 100644
index bdd48561..00000000
--- a/kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am
+++ /dev/null
@@ -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) \ No newline at end of file
diff --git a/kopete/styles/Makefile.am b/kopete/styles/Makefile.am
index 39e20e7b..3d7bcf09 100644
--- a/kopete/styles/Makefile.am
+++ b/kopete/styles/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = Kopete Hacker Clean Clear Konqi Retropete Gaim
+SUBDIRS = Kopete Hacker Clean Clear Konqi Retropete Pidgin
diff --git a/kopete/styles/Gaim/CMakeLists.txt b/kopete/styles/Pidgin/CMakeLists.txt
index f08e42e2..f08e42e2 100644
--- a/kopete/styles/Gaim/CMakeLists.txt
+++ b/kopete/styles/Pidgin/CMakeLists.txt
diff --git a/kopete/styles/Gaim/CREDITS b/kopete/styles/Pidgin/CREDITS
index 4e523780..ee91cc7b 100644
--- a/kopete/styles/Gaim/CREDITS
+++ b/kopete/styles/Pidgin/CREDITS
@@ -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
diff --git a/kopete/styles/Gaim/Contents/CMakeLists.txt b/kopete/styles/Pidgin/Contents/CMakeLists.txt
index 88724a18..88724a18 100644
--- a/kopete/styles/Gaim/Contents/CMakeLists.txt
+++ b/kopete/styles/Pidgin/Contents/CMakeLists.txt
diff --git a/kopete/styles/Gaim/Contents/Info.plist b/kopete/styles/Pidgin/Contents/Info.plist
index c5fb6825..87cd60e5 100644
--- a/kopete/styles/Gaim/Contents/Info.plist
+++ b/kopete/styles/Pidgin/Contents/Info.plist
@@ -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>
diff --git a/kopete/styles/Gaim/Contents/Makefile.am b/kopete/styles/Pidgin/Contents/Makefile.am
index 6940fe81..6940fe81 100644
--- a/kopete/styles/Gaim/Contents/Makefile.am
+++ b/kopete/styles/Pidgin/Contents/Makefile.am
diff --git a/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt
index f212a870..1ab98d54 100644
--- a/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt
+++ b/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt
@@ -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 )
diff --git a/kopete/styles/Pidgin/Contents/Resources/Footer.html b/kopete/styles/Pidgin/Contents/Resources/Footer.html
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kopete/styles/Pidgin/Contents/Resources/Footer.html
diff --git a/kopete/styles/Pidgin/Contents/Resources/Header.html b/kopete/styles/Pidgin/Contents/Resources/Header.html
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kopete/styles/Pidgin/Contents/Resources/Header.html
diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html
index 0f2993c6..0f2993c6 100644
--- a/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html
+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html
diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt
index f4a2302f..6ff0e0dc 100644
--- a/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt
+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt
@@ -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 )
diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html
index 89d07c93..89d07c93 100644
--- a/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html
+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html
diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am
new file mode 100644
index 00000000..7cd39029
--- /dev/null
+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am
@@ -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) \ No newline at end of file
diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html
index 89d07c93..89d07c93 100644
--- a/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html
+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html
diff --git a/kopete/styles/Gaim/Contents/Resources/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Makefile.am
index 75c9567d..f3500452 100644
--- a/kopete/styles/Gaim/Contents/Resources/Makefile.am
+++ b/kopete/styles/Pidgin/Contents/Resources/Makefile.am
@@ -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) \ No newline at end of file
diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html
index a7d6ef00..a7d6ef00 100644
--- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html
+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html
diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt
index 32d0ae5d..68bcd9c7 100644
--- a/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt
+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt
@@ -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 )
diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html
index 9ea2bb6a..9ea2bb6a 100644
--- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html
+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html
diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am
index ce2edce7..85a558de 100644
--- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am
+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am
@@ -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)
diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html
index 9ea2bb6a..9ea2bb6a 100644
--- a/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html
+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html
diff --git a/kopete/styles/Gaim/Contents/Resources/Status.html b/kopete/styles/Pidgin/Contents/Resources/Status.html
index 4858785a..4858785a 100644
--- a/kopete/styles/Gaim/Contents/Resources/Status.html
+++ b/kopete/styles/Pidgin/Contents/Resources/Status.html
diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt
index fda30228..4976ef97 100644
--- a/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt
+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt
@@ -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 )
diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css
index 7a855567..7a855567 100644
--- a/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css
+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css
diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am
new file mode 100644
index 00000000..5bbbc310
--- /dev/null
+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am
@@ -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) \ No newline at end of file
diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css
index f9fce97a..f9fce97a 100644
--- a/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css
+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css
diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css
index d847a191..d847a191 100644
--- a/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css
+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css
diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css
index 373f6d77..373f6d77 100644
--- a/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css
+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css
diff --git a/kopete/styles/Gaim/Contents/Resources/main.css b/kopete/styles/Pidgin/Contents/Resources/main.css
index 393d2f10..393d2f10 100644
--- a/kopete/styles/Gaim/Contents/Resources/main.css
+++ b/kopete/styles/Pidgin/Contents/Resources/main.css
diff --git a/kopete/styles/Gaim/Makefile.am b/kopete/styles/Pidgin/Makefile.am
index 331c9b59..331c9b59 100644
--- a/kopete/styles/Gaim/Makefile.am
+++ b/kopete/styles/Pidgin/Makefile.am