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/ChangeLog | 2 +- kopete/protocols/groupwise/gwprotocol.cpp | 4 +-- kopete/protocols/groupwise/gwprotocol.h | 2 +- .../groupwise/libgroupwise/coreprotocol.cpp | 6 ++-- .../groupwise/libgroupwise/eventprotocol.cpp | 2 +- .../groupwise/libgroupwise/gwclientstream.cpp | 2 +- .../groupwise/libgroupwise/tasks/getstatustask.cpp | 2 +- .../libgroupwise/tasks/sendmessagetask.cpp | 2 +- kopete/protocols/jabber/jabberchatsession.cpp | 2 +- .../jingle/libjingle/talk/examples/call/status.h | 2 +- kopete/protocols/meanwhile/README | 2 +- kopete/protocols/msn/ReleaseNotes | 2 +- kopete/protocols/msn/msnaccount.cpp | 2 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 2 +- kopete/protocols/oscar/liboscar/TODO | 2 +- kopete/protocols/oscar/liboscar/buddyicontask.cpp | 2 +- .../oscar/liboscar/chatnavservicetask.cpp | 2 +- kopete/protocols/oscar/liboscar/coreprotocol.cpp | 2 +- .../protocols/oscar/liboscar/sendmessagetask.cpp | 4 +-- kopete/protocols/oscar/liboscar/userdetails.cpp | 6 ++-- kopete/protocols/yahoo/libkyahoo/libyahoo.c | 4 +-- kopete/protocols/yahoo/libkyahoo/libyahoo.h | 4 +-- kopete/protocols/yahoo/libkyahoo/yahoo_fn.c | 2 +- kopete/protocols/yahoo/libkyahoo/yahoo_fn.h | 2 +- kopete/protocols/yahoo/yahooaccount.cpp | 2 +- kopete/styles/CMakeLists.txt | 2 +- kopete/styles/Gaim/CMakeLists.txt | 12 ------- kopete/styles/Gaim/CREDITS | 7 ---- kopete/styles/Gaim/Contents/CMakeLists.txt | 12 ------- kopete/styles/Gaim/Contents/Info.plist | 31 ----------------- kopete/styles/Gaim/Contents/Makefile.am | 1 - .../styles/Gaim/Contents/Resources/CMakeLists.txt | 18 ---------- .../Gaim/Contents/Resources/Incoming/Action.html | 6 ---- .../Contents/Resources/Incoming/CMakeLists.txt | 14 -------- .../Gaim/Contents/Resources/Incoming/Content.html | 6 ---- .../Gaim/Contents/Resources/Incoming/Makefile.am | 4 --- .../Contents/Resources/Incoming/NextContent.html | 6 ---- kopete/styles/Gaim/Contents/Resources/Makefile.am | 5 --- .../Gaim/Contents/Resources/Outgoing/Action.html | 6 ---- .../Contents/Resources/Outgoing/CMakeLists.txt | 14 -------- .../Gaim/Contents/Resources/Outgoing/Content.html | 6 ---- .../Gaim/Contents/Resources/Outgoing/Makefile.am | 4 --- .../Contents/Resources/Outgoing/NextContent.html | 6 ---- kopete/styles/Gaim/Contents/Resources/Status.html | 5 --- .../Contents/Resources/Variants/CMakeLists.txt | 14 -------- .../Contents/Resources/Variants/Contact-Colors.css | 10 ------ .../Gaim/Contents/Resources/Variants/Makefile.am | 4 --- .../Contents/Resources/Variants/Name-Colors.css | 13 ------- .../Gaim/Contents/Resources/Variants/No-Colors.css | 22 ------------ .../Contents/Resources/Variants/Status-Colors.css | 9 ----- kopete/styles/Gaim/Contents/Resources/main.css | 40 ---------------------- kopete/styles/Gaim/Makefile.am | 1 - kopete/styles/Makefile.am | 2 +- kopete/styles/Pidgin/CMakeLists.txt | 12 +++++++ kopete/styles/Pidgin/CREDITS | 7 ++++ kopete/styles/Pidgin/Contents/CMakeLists.txt | 12 +++++++ kopete/styles/Pidgin/Contents/Info.plist | 31 +++++++++++++++++ kopete/styles/Pidgin/Contents/Makefile.am | 1 + .../Pidgin/Contents/Resources/CMakeLists.txt | 18 ++++++++++ .../styles/Pidgin/Contents/Resources/Footer.html | 0 .../styles/Pidgin/Contents/Resources/Header.html | 0 .../Pidgin/Contents/Resources/Incoming/Action.html | 6 ++++ .../Contents/Resources/Incoming/CMakeLists.txt | 14 ++++++++ .../Contents/Resources/Incoming/Content.html | 6 ++++ .../Pidgin/Contents/Resources/Incoming/Makefile.am | 4 +++ .../Contents/Resources/Incoming/NextContent.html | 6 ++++ .../styles/Pidgin/Contents/Resources/Makefile.am | 5 +++ .../Pidgin/Contents/Resources/Outgoing/Action.html | 6 ++++ .../Contents/Resources/Outgoing/CMakeLists.txt | 14 ++++++++ .../Contents/Resources/Outgoing/Content.html | 6 ++++ .../Pidgin/Contents/Resources/Outgoing/Makefile.am | 4 +++ .../Contents/Resources/Outgoing/NextContent.html | 6 ++++ .../styles/Pidgin/Contents/Resources/Status.html | 5 +++ .../Contents/Resources/Variants/CMakeLists.txt | 14 ++++++++ .../Contents/Resources/Variants/Contact-Colors.css | 10 ++++++ .../Pidgin/Contents/Resources/Variants/Makefile.am | 4 +++ .../Contents/Resources/Variants/Name-Colors.css | 13 +++++++ .../Contents/Resources/Variants/No-Colors.css | 22 ++++++++++++ .../Contents/Resources/Variants/Status-Colors.css | 9 +++++ kopete/styles/Pidgin/Contents/Resources/main.css | 40 ++++++++++++++++++++++ kopete/styles/Pidgin/Makefile.am | 1 + 81 files changed, 311 insertions(+), 311 deletions(-) delete mode 100644 kopete/styles/Gaim/CMakeLists.txt delete mode 100644 kopete/styles/Gaim/CREDITS delete mode 100644 kopete/styles/Gaim/Contents/CMakeLists.txt delete mode 100644 kopete/styles/Gaim/Contents/Info.plist delete mode 100644 kopete/styles/Gaim/Contents/Makefile.am delete mode 100644 kopete/styles/Gaim/Contents/Resources/CMakeLists.txt delete mode 100644 kopete/styles/Gaim/Contents/Resources/Incoming/Action.html delete mode 100644 kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt delete mode 100644 kopete/styles/Gaim/Contents/Resources/Incoming/Content.html delete mode 100644 kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am delete mode 100644 kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html delete mode 100644 kopete/styles/Gaim/Contents/Resources/Makefile.am delete mode 100644 kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html delete mode 100644 kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt delete mode 100644 kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html delete mode 100644 kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am delete mode 100644 kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html delete mode 100644 kopete/styles/Gaim/Contents/Resources/Status.html delete mode 100644 kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt delete mode 100644 kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css delete mode 100644 kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am delete mode 100644 kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css delete mode 100644 kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css delete mode 100644 kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css delete mode 100644 kopete/styles/Gaim/Contents/Resources/main.css delete mode 100644 kopete/styles/Gaim/Makefile.am create mode 100644 kopete/styles/Pidgin/CMakeLists.txt create mode 100644 kopete/styles/Pidgin/CREDITS create mode 100644 kopete/styles/Pidgin/Contents/CMakeLists.txt create mode 100644 kopete/styles/Pidgin/Contents/Info.plist create mode 100644 kopete/styles/Pidgin/Contents/Makefile.am create mode 100644 kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt create mode 100644 kopete/styles/Pidgin/Contents/Resources/Footer.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Header.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt create mode 100644 kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am create mode 100644 kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Makefile.am create mode 100644 kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt create mode 100644 kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am create mode 100644 kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Status.html create mode 100644 kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt create mode 100644 kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css create mode 100644 kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am create mode 100644 kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css create mode 100644 kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css create mode 100644 kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css create mode 100644 kopete/styles/Pidgin/Contents/Resources/main.css create mode 100644 kopete/styles/Pidgin/Makefile.am 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 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 - 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 @@ -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 - 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 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 @@ -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 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
- // 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 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 * * 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 + * This code is derivitive of Pidgin * copyright (C) 1998-1999, Mark Spencer * 1998-1999, Adam Fritzler * 1998-2002, Rob Flynn 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 * * 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 + * This code is derivitive of Pidgin * copyright (C) 1998-1999, Mark Spencer * 1998-1999, Adam Fritzler * 1998-2002, Rob Flynn 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 * libfaim code copyright 1998, 1999 Adam Fritzler 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", "" ); filteredMsg.replace( "\033[x4m", "" ); - //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", "" ); filteredMsg.replace( "\033[x3m", "" ); 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/CMakeLists.txt b/kopete/styles/Gaim/CMakeLists.txt deleted file mode 100644 index f08e42e2..00000000 --- a/kopete/styles/Gaim/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( Contents ) diff --git a/kopete/styles/Gaim/CREDITS b/kopete/styles/Gaim/CREDITS deleted file mode 100644 index 4e523780..00000000 --- a/kopete/styles/Gaim/CREDITS +++ /dev/null @@ -1,7 +0,0 @@ -Original textonly Style for Adium written by Mark Fickett -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 diff --git a/kopete/styles/Gaim/Contents/CMakeLists.txt b/kopete/styles/Gaim/Contents/CMakeLists.txt deleted file mode 100644 index 88724a18..00000000 --- a/kopete/styles/Gaim/Contents/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( Resources ) diff --git a/kopete/styles/Gaim/Contents/Info.plist b/kopete/styles/Gaim/Contents/Info.plist deleted file mode 100644 index c5fb6825..00000000 --- a/kopete/styles/Gaim/Contents/Info.plist +++ /dev/null @@ -1,31 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleGetInfoString - Gaim Kopete chat Style - CFBundleIdentifier - Kopete.Gaim.style - CFBundleInfoDictionaryVersion - 1.0 - CFBundleName - Gaim - CFBundlePackageType - KopeteChatStyle - DefaultBackgroundColor - FFFFFF - DefaultFontFamily - DejaVu Sans Mono - DefaultFontSize - 12 - DisableCustomBackground - - DisplayNameForNoVariant - grays - ShowsUserIcons - - - diff --git a/kopete/styles/Gaim/Contents/Makefile.am b/kopete/styles/Gaim/Contents/Makefile.am deleted file mode 100644 index 6940fe81..00000000 --- a/kopete/styles/Gaim/Contents/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = Resources \ No newline at end of file diff --git a/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt deleted file mode 100644 index f212a870..00000000 --- a/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( Incoming ) -add_subdirectory( Outgoing ) -add_subdirectory( Variants ) - -install( FILES - main.css Footer.html Header.html Status.html - DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources ) diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html b/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html deleted file mode 100644 index 0f2993c6..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html +++ /dev/null @@ -1,6 +0,0 @@ -
- (%time{%H:%M:%S}%) - %sender%:  - %message% -
-
diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt deleted file mode 100644 index f4a2302f..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -install( FILES - Action.html Content.html NextContent.html - DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Incoming ) diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html b/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html deleted file mode 100644 index 89d07c93..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html +++ /dev/null @@ -1,6 +0,0 @@ -
- (%time{%H:%M:%S}%) - %sender%:  - %message% -
-
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/Incoming/NextContent.html b/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html deleted file mode 100644 index 89d07c93..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html +++ /dev/null @@ -1,6 +0,0 @@ -
- (%time{%H:%M:%S}%) - %sender%:  - %message% -
-
diff --git a/kopete/styles/Gaim/Contents/Resources/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Makefile.am deleted file mode 100644 index 75c9567d..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = Incoming Outgoing Variants -style_DATA = main.css Footer.html Header.html Status.html -styledir = $(kde_datadir)/kopete/styles/Gaim/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/Gaim/Contents/Resources/Outgoing/Action.html deleted file mode 100644 index a7d6ef00..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html +++ /dev/null @@ -1,6 +0,0 @@ -
- (%time{%H:%M:%S}%) - %sender%:  - %message% -
-
diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt deleted file mode 100644 index 32d0ae5d..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -install( FILES - Action.html Content.html NextContent.html - DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Outgoing ) diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html b/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html deleted file mode 100644 index 9ea2bb6a..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html +++ /dev/null @@ -1,6 +0,0 @@ -
- (%time{%H:%M:%S}%) - %sender%:  - %message% -
-
diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am deleted file mode 100644 index ce2edce7..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -style_DATA = Action.html Content.html NextContent.html -styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources/Outgoing - -EXTRA_DIST = $(style_DATA) diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html b/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html deleted file mode 100644 index 9ea2bb6a..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html +++ /dev/null @@ -1,6 +0,0 @@ -
- (%time{%H:%M:%S}%) - %sender%:  - %message% -
-
diff --git a/kopete/styles/Gaim/Contents/Resources/Status.html b/kopete/styles/Gaim/Contents/Resources/Status.html deleted file mode 100644 index 4858785a..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Status.html +++ /dev/null @@ -1,5 +0,0 @@ -
- (%time{%H:%M:%S}%) - #  - %message% -
diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt deleted file mode 100644 index fda30228..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -install( FILES - No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css - DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Variants ) diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css deleted file mode 100644 index 7a855567..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css +++ /dev/null @@ -1,10 +0,0 @@ - -@import url(../main.css); - -.inContentTime, .inMetacontact { - color: inherit; -} - -.outContentTime, .outMetacontact { - color: inherit; -} \ 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/Gaim/Contents/Resources/Variants/Name-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css deleted file mode 100644 index f9fce97a..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css +++ /dev/null @@ -1,13 +0,0 @@ -@import url(../main.css); - -.inActionTime, .inActionMetacontact, .inActionMessage { - color: #000000; -} - -.outActionTime, .outActionMetacontact, .outActionMessage { - color: #000000; -} - -.InternalTime, .InternalDelim, .InternalMessage { - color: #000000; -} \ No newline at end of file diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css deleted file mode 100644 index d847a191..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css +++ /dev/null @@ -1,22 +0,0 @@ -@import url(../main.css); - -.inContentTime, .inMetacontact { - color: #000000; -} - -.outContentTime, .outMetacontact { - color: #000000; -} - -.inActionTime, .inActionMetacontact, .inActionMessage { - color: #000000; -} - -.outActionTime, .outActionMetacontact, .outActionMessage { - color: #000000; -} - -.InternalTime, .InternalDelim, .InternalMessage { - color: #000000; -} - diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css deleted file mode 100644 index 373f6d77..00000000 --- a/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css +++ /dev/null @@ -1,9 +0,0 @@ -@import url(../main.css); - -.inContentTime, .inMetacontact { - color: #000000; -} - -.outContentTime, .outMetacontact { - color: #000000; -} \ No newline at end of file diff --git a/kopete/styles/Gaim/Contents/Resources/main.css b/kopete/styles/Gaim/Contents/Resources/main.css deleted file mode 100644 index 393d2f10..00000000 --- a/kopete/styles/Gaim/Contents/Resources/main.css +++ /dev/null @@ -1,40 +0,0 @@ -/* textonly by Mark Fickett, 2004. Poke/edit/maul, but leave credit - think GPL */ -/* Generally: naib.webhop.org Adium-related: naib.webhop.org/~markfickett/adium */ - -body { - background: #ffffff; -} - -div { - overflow: auto; -} - -a:link { text-decoration: none; } -a:visited { text-decoration: none; } -a:hover { text-decoration: underline; } -a:active { text-decoration: none; } - -.inMetacontact, .outMetacontact, .inActionMetacontact, .outActionMetacontact, .InternalDelim { - font-weight: bold; -} - -.inContentTime, .inMetacontact { - color: #a82f2f; -} - -.outContentTime, .outMetacontact { - color: #16569e; -} - -.inActionTime, .inActionMetacontact, .inActionMessage { - color: green; -} - -.outActionTime, .outActionMetacontact, .outActionMessage { - color: green; -} - -.InternalTime, .InternalDelim, .InternalMessage { - color: #9400d3; -} - diff --git a/kopete/styles/Gaim/Makefile.am b/kopete/styles/Gaim/Makefile.am deleted file mode 100644 index 331c9b59..00000000 --- a/kopete/styles/Gaim/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = Contents \ 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/Pidgin/CMakeLists.txt b/kopete/styles/Pidgin/CMakeLists.txt new file mode 100644 index 00000000..f08e42e2 --- /dev/null +++ b/kopete/styles/Pidgin/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( Contents ) diff --git a/kopete/styles/Pidgin/CREDITS b/kopete/styles/Pidgin/CREDITS new file mode 100644 index 00000000..ee91cc7b --- /dev/null +++ b/kopete/styles/Pidgin/CREDITS @@ -0,0 +1,7 @@ +Original textonly Style for Adium written by Mark Fickett +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 Pidgin Style for Kopete written by Thanos Kyritsis diff --git a/kopete/styles/Pidgin/Contents/CMakeLists.txt b/kopete/styles/Pidgin/Contents/CMakeLists.txt new file mode 100644 index 00000000..88724a18 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( Resources ) diff --git a/kopete/styles/Pidgin/Contents/Info.plist b/kopete/styles/Pidgin/Contents/Info.plist new file mode 100644 index 00000000..87cd60e5 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Info.plist @@ -0,0 +1,31 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleGetInfoString + Pidgin Kopete chat Style + CFBundleIdentifier + Kopete.Pidgin.style + CFBundleInfoDictionaryVersion + 1.0 + CFBundleName + Pidgin + CFBundlePackageType + KopeteChatStyle + DefaultBackgroundColor + FFFFFF + DefaultFontFamily + DejaVu Sans Mono + DefaultFontSize + 12 + DisableCustomBackground + + DisplayNameForNoVariant + grays + ShowsUserIcons + + + diff --git a/kopete/styles/Pidgin/Contents/Makefile.am b/kopete/styles/Pidgin/Contents/Makefile.am new file mode 100644 index 00000000..6940fe81 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = Resources \ No newline at end of file diff --git a/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt new file mode 100644 index 00000000..1ab98d54 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt @@ -0,0 +1,18 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( Incoming ) +add_subdirectory( Outgoing ) +add_subdirectory( Variants ) + +install( FILES + main.css Footer.html Header.html Status.html + 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 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 diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html new file mode 100644 index 00000000..0f2993c6 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html @@ -0,0 +1,6 @@ +
+ (%time{%H:%M:%S}%) + %sender%:  + %message% +
+
diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt new file mode 100644 index 00000000..6ff0e0dc --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + Action.html Content.html NextContent.html + DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Incoming ) diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html new file mode 100644 index 00000000..89d07c93 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html @@ -0,0 +1,6 @@ +
+ (%time{%H:%M:%S}%) + %sender%:  + %message% +
+
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/Pidgin/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html new file mode 100644 index 00000000..89d07c93 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html @@ -0,0 +1,6 @@ +
+ (%time{%H:%M:%S}%) + %sender%:  + %message% +
+
diff --git a/kopete/styles/Pidgin/Contents/Resources/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Makefile.am new file mode 100644 index 00000000..f3500452 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = Incoming Outgoing Variants +style_DATA = main.css Footer.html Header.html Status.html +styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources + +EXTRA_DIST = $(style_DATA) \ No newline at end of file diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html new file mode 100644 index 00000000..a7d6ef00 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html @@ -0,0 +1,6 @@ +
+ (%time{%H:%M:%S}%) + %sender%:  + %message% +
+
diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt new file mode 100644 index 00000000..68bcd9c7 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + Action.html Content.html NextContent.html + DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Outgoing ) diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html new file mode 100644 index 00000000..9ea2bb6a --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html @@ -0,0 +1,6 @@ +
+ (%time{%H:%M:%S}%) + %sender%:  + %message% +
+
diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am new file mode 100644 index 00000000..85a558de --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am @@ -0,0 +1,4 @@ +style_DATA = Action.html Content.html NextContent.html +styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources/Outgoing + +EXTRA_DIST = $(style_DATA) diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html new file mode 100644 index 00000000..9ea2bb6a --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html @@ -0,0 +1,6 @@ +
+ (%time{%H:%M:%S}%) + %sender%:  + %message% +
+
diff --git a/kopete/styles/Pidgin/Contents/Resources/Status.html b/kopete/styles/Pidgin/Contents/Resources/Status.html new file mode 100644 index 00000000..4858785a --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Status.html @@ -0,0 +1,5 @@ +
+ (%time{%H:%M:%S}%) + #  + %message% +
diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt new file mode 100644 index 00000000..4976ef97 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css + DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Variants ) diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css new file mode 100644 index 00000000..7a855567 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css @@ -0,0 +1,10 @@ + +@import url(../main.css); + +.inContentTime, .inMetacontact { + color: inherit; +} + +.outContentTime, .outMetacontact { + color: inherit; +} \ No newline at end of file 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/Pidgin/Contents/Resources/Variants/Name-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css new file mode 100644 index 00000000..f9fce97a --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css @@ -0,0 +1,13 @@ +@import url(../main.css); + +.inActionTime, .inActionMetacontact, .inActionMessage { + color: #000000; +} + +.outActionTime, .outActionMetacontact, .outActionMessage { + color: #000000; +} + +.InternalTime, .InternalDelim, .InternalMessage { + color: #000000; +} \ No newline at end of file diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css new file mode 100644 index 00000000..d847a191 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css @@ -0,0 +1,22 @@ +@import url(../main.css); + +.inContentTime, .inMetacontact { + color: #000000; +} + +.outContentTime, .outMetacontact { + color: #000000; +} + +.inActionTime, .inActionMetacontact, .inActionMessage { + color: #000000; +} + +.outActionTime, .outActionMetacontact, .outActionMessage { + color: #000000; +} + +.InternalTime, .InternalDelim, .InternalMessage { + color: #000000; +} + diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css new file mode 100644 index 00000000..373f6d77 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css @@ -0,0 +1,9 @@ +@import url(../main.css); + +.inContentTime, .inMetacontact { + color: #000000; +} + +.outContentTime, .outMetacontact { + color: #000000; +} \ No newline at end of file diff --git a/kopete/styles/Pidgin/Contents/Resources/main.css b/kopete/styles/Pidgin/Contents/Resources/main.css new file mode 100644 index 00000000..393d2f10 --- /dev/null +++ b/kopete/styles/Pidgin/Contents/Resources/main.css @@ -0,0 +1,40 @@ +/* textonly by Mark Fickett, 2004. Poke/edit/maul, but leave credit - think GPL */ +/* Generally: naib.webhop.org Adium-related: naib.webhop.org/~markfickett/adium */ + +body { + background: #ffffff; +} + +div { + overflow: auto; +} + +a:link { text-decoration: none; } +a:visited { text-decoration: none; } +a:hover { text-decoration: underline; } +a:active { text-decoration: none; } + +.inMetacontact, .outMetacontact, .inActionMetacontact, .outActionMetacontact, .InternalDelim { + font-weight: bold; +} + +.inContentTime, .inMetacontact { + color: #a82f2f; +} + +.outContentTime, .outMetacontact { + color: #16569e; +} + +.inActionTime, .inActionMetacontact, .inActionMessage { + color: green; +} + +.outActionTime, .outActionMetacontact, .outActionMessage { + color: green; +} + +.InternalTime, .InternalDelim, .InternalMessage { + color: #9400d3; +} + diff --git a/kopete/styles/Pidgin/Makefile.am b/kopete/styles/Pidgin/Makefile.am new file mode 100644 index 00000000..331c9b59 --- /dev/null +++ b/kopete/styles/Pidgin/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = Contents \ No newline at end of file -- cgit v1.2.1