diff options
| author | daleharvey <daleharvey@users.sourceforge.net> | 2006-08-06 21:48:20 +0000 |
|---|---|---|
| committer | daleharvey <daleharvey@users.sourceforge.net> | 2006-08-06 21:48:20 +0000 |
| commit | 4e40ccca5c3ebae1987c80f2f294dea54398a8e4 (patch) | |
| tree | eebced966041a9f6e428f3271a563a784c780571 /src/jabber_whiteboard/session-manager.cpp | |
| parent | Changed the PANGO_GLYPH_* defines to their actual values so skipping empty or... (diff) | |
| download | inkscape-4e40ccca5c3ebae1987c80f2f294dea54398a8e4.tar.gz inkscape-4e40ccca5c3ebae1987c80f2f294dea54398a8e4.zip | |
initial keynodetable work
(bzr r1570)
Diffstat (limited to 'src/jabber_whiteboard/session-manager.cpp')
| -rw-r--r-- | src/jabber_whiteboard/session-manager.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/jabber_whiteboard/session-manager.cpp b/src/jabber_whiteboard/session-manager.cpp index 3dcb8e217..35d87b4b5 100644 --- a/src/jabber_whiteboard/session-manager.cpp +++ b/src/jabber_whiteboard/session-manager.cpp @@ -234,7 +234,7 @@ SessionManager::processWhiteboardEvent(Pedro::XmppEvent const& event) } Pedro::DOMString session = root->getTagAttribute("wb", "session"); - Pedro::DOMString type = root->getTagAttribute("session", "type"); + Pedro::DOMString type = root->getTagAttribute("message", "type"); Pedro::DOMString domwrapper = root->getFirstChild()->getFirstChild()->getFirstChild()->getName(); if (session.empty()) { @@ -250,9 +250,10 @@ SessionManager::processWhiteboardEvent(Pedro::XmppEvent const& event) { Message::Wrapper wrapper = static_cast< Message::Wrapper >(domwrapper); InkboardDocument* doc = getInkboardSession(session); - doc->processInkboardEvent(wrapper, root->getFirstChild()); - } + if(doc != NULL) + doc->recieve(wrapper, root->getFirstChild()); + } } char* @@ -328,12 +329,12 @@ SessionManager::checkInvitationQueue() switch (reply) { case Dialog::ACCEPT_INVITATION:{ - inkdoc->sendProtocol(from, Message::PROTOCOL,Message::ACCEPT_INVITATION); + inkdoc->send(from, Message::PROTOCOL,Message::ACCEPT_INVITATION); makeInkboardDesktop(doc); break; } case Dialog::DECLINE_INVITATION: default: { - inkdoc->sendProtocol(from, Message::PROTOCOL,Message::DECLINE_INVITATION); + inkdoc->send(from, Message::PROTOCOL,Message::DECLINE_INVITATION); terminateSession(sessionId); break; } } |