From 6e76ea6798905b5afa5079133a957fbe93bac028 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 2 Nov 2012 12:02:09 -0500 Subject: Update kopete references of gaim to pidgin. This resolves bug report 865. Thanks to Kristopher Gamrat. --- kopete/protocols/groupwise/gwprotocol.cpp | 4 ++-- kopete/protocols/groupwise/gwprotocol.h | 2 +- kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp | 6 +++--- kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp | 2 +- kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp | 2 +- kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp | 2 +- kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'kopete/protocols/groupwise') 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 ) ); -- cgit v1.2.3