summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2006-11-24 00:17:15 +0000
committerishmal <ishmal@users.sourceforge.net>2006-11-24 00:17:15 +0000
commit795d922cd08d042f50e06207f86498676716aea7 (patch)
tree9fcad4a11b899b07069fea255e3524bc43d38426 /src
parentremove 'from=' from messages, to work better with googletalk. It mangles the... (diff)
downloadinkscape-795d922cd08d042f50e06207f86498676716aea7.tar.gz
inkscape-795d922cd08d042f50e06207f86498676716aea7.zip
remove error message from groupChatCreate(). Gtalk should be ok with groups now.
(bzr r2019)
Diffstat (limited to 'src')
-rw-r--r--src/pedro/pedroxmpp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pedro/pedroxmpp.cpp b/src/pedro/pedroxmpp.cpp
index 2e6f74c6a..53bac92d5 100644
--- a/src/pedro/pedroxmpp.cpp
+++ b/src/pedro/pedroxmpp.cpp
@@ -1120,7 +1120,7 @@ bool XmppClient::processPresence(Element *root)
//printf("fromGid:%s fromNick:%s\n",
// fromGid.c_str(), fromNick.c_str());
DOMString item_jid = root->getTagAttribute("item", "jid");
- if (item_jid == jid) //Me
+ if (item_jid == jid || item_jid == to) //Me
{
if (presence)
{
@@ -2639,7 +2639,7 @@ bool XmppClient::groupChatCreate(const DOMString &groupJid)
{
if ((*iter)->getGroupJid() == groupJid)
{
- error("Group chat '%s' already exists", groupJid.c_str());
+ //error("Group chat '%s' already exists", groupJid.c_str());
return false;
}
}