summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordknn <yoann.blein@free.fr>2012-08-04 09:13:14 (GMT)
committerdknn <yoann.blein@free.fr>2012-09-22 09:01:49 (GMT)
commit5ed2b62239eda07de84142e63fad31ccc194d379 (patch)
tree47d7dd469b7f637ee125371d267eaae17a6978a7 /Swiften/ScreenSharing/IncomingScreenSharing.cpp
parent292967c02ffc2ff0b53df526af2965a03916290c (diff)
downloadswift-contrib-5ed2b62239eda07de84142e63fad31ccc194d379.zip
swift-contrib-5ed2b62239eda07de84142e63fad31ccc194d379.tar.bz2
Fix bug with ipv6 + add new feature in disco
Diffstat (limited to 'Swiften/ScreenSharing/IncomingScreenSharing.cpp')
-rw-r--r--Swiften/ScreenSharing/IncomingScreenSharing.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Swiften/ScreenSharing/IncomingScreenSharing.cpp b/Swiften/ScreenSharing/IncomingScreenSharing.cpp
index 3807a0f..bbbfbad 100644
--- a/Swiften/ScreenSharing/IncomingScreenSharing.cpp
+++ b/Swiften/ScreenSharing/IncomingScreenSharing.cpp
@@ -79,6 +79,11 @@ void IncomingScreenSharing::accept()
onStateChange(ScreenSharing::Connecting);
}
+const JID &IncomingScreenSharing::getSender() const
+{
+ return jingleSession->getInitiator();
+}
+
JingleContentID IncomingScreenSharing::getContentID() const
{
return JingleContentID(initialContent->getName(), initialContent->getCreator());