summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-11-02 12:02:09 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-11-02 12:02:09 -0500
commit6e76ea6798905b5afa5079133a957fbe93bac028 (patch)
tree380ed299ef9e994abef18a637b43e83af3526931 /kopete/protocols/jabber
parent3144ada216561f263ba92045fd19066b3cfe6390 (diff)
downloadtdenetwork-6e76ea6798905b5afa5079133a957fbe93bac028.tar.gz
tdenetwork-6e76ea6798905b5afa5079133a957fbe93bac028.zip
Update kopete references of gaim to pidgin.
This resolves bug report 865. Thanks to Kristopher Gamrat.
Diffstat (limited to 'kopete/protocols/jabber')
-rw-r--r--kopete/protocols/jabber/jabberchatsession.cpp2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h2
2 files changed, 2 insertions, 2 deletions
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;
}