summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-01-29 17:48:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-01-29 18:45:34 (GMT)
commit869c52b244c2d03313e9eda83fac05bf0fc3a619 (patch)
tree63f0518e15d0c23ece6eb55733c2ef44f710bf01 /Swiften/Serializer
parent11a7f5c48ea9c90e9adaaa06a96e0a9116234bff (diff)
downloadswift-869c52b244c2d03313e9eda83fac05bf0fc3a619.zip
swift-869c52b244c2d03313e9eda83fac05bf0fc3a619.tar.bz2
Added some experimental Jingle classes.
Diffstat (limited to 'Swiften/Serializer')
-rw-r--r--Swiften/Serializer/PayloadSerializers/StreamInitiationSerializer.cpp2
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/StreamInitiationSerializer.cpp b/Swiften/Serializer/PayloadSerializers/StreamInitiationSerializer.cpp
index 71702d0..0c7f593 100644
--- a/Swiften/Serializer/PayloadSerializers/StreamInitiationSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/StreamInitiationSerializer.cpp
@@ -35,7 +35,7 @@ String StreamInitiationSerializer::serializePayload(boost::shared_ptr<StreamInit
siElement.setAttribute("profile", FILE_TRANSFER_NS);
if (streamInitiation->getFileInfo()) {
- StreamInitiation::FileInfo file = *streamInitiation->getFileInfo();
+ StreamInitiationFileInfo file = *streamInitiation->getFileInfo();
boost::shared_ptr<XMLElement> fileElement(new XMLElement("file", "http://jabber.org/protocol/si/profile/file-transfer"));
fileElement->setAttribute("name", file.name);
if (file.size != -1) {
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp
index 12c8485..e1a13b8 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/StreamInitiationSerializerTest.cpp
@@ -21,7 +21,7 @@ class StreamInitiationSerializerTest : public CppUnit::TestFixture{
void testSerialize_Request() {
StreamInitiationSerializer testling;
boost::shared_ptr<StreamInitiation> streamInitiation(new StreamInitiation());
- StreamInitiation::FileInfo fileInfo("test.txt", "This is info about the file.", 1022);
+ StreamInitiationFileInfo fileInfo("test.txt", "This is info about the file.", 1022);
streamInitiation->setID("a0");
streamInitiation->setFileInfo(fileInfo);
streamInitiation->addProvidedMethod("http://jabber.org/protocol/bytestreams");