3 files changed, 15 insertions, 12 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index 69b5c89..0160a7a 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -25,7 +25,7 @@ FileTransferController::FileTransferController(const JID& receipient, const std:
 }
 
 FileTransferController::FileTransferController(IncomingFileTransfer::ref transfer) :
-	sending(false), otherParty(transfer->getSender()), filename(transfer->filename), transfer(transfer), ftManager(0), ftProgressInfo(0), chatWindow(0), currentState(FileTransfer::State::WaitingForStart) {
+	sending(false), otherParty(transfer->getSender()), filename(transfer->getFileName()), transfer(transfer), ftManager(0), ftProgressInfo(0), chatWindow(0), currentState(FileTransfer::State::WaitingForStart) {
 
 }
 
@@ -42,7 +42,7 @@ std::string FileTransferController::setChatWindow(ChatWindow* wnd, std::string n
 	if (sending) {
 		uiID = wnd->addFileTransfer(QT_TRANSLATE_NOOP("", "me"), true, filename, boost::filesystem::file_size(boost::filesystem::path(filename)));
 	} else {
-		uiID = wnd->addFileTransfer(nickname, false, filename, transfer->fileSizeInBytes);
+		uiID = wnd->addFileTransfer(nickname, false, filename, transfer->getFileSizeInBytes());
 	}
 	return uiID;
 }
@@ -65,7 +65,7 @@ int FileTransferController::getProgress() const {
 
 boost::uintmax_t FileTransferController::getSize() const {
 	if (transfer) {
-		return transfer->fileSizeInBytes;
+		return transfer->getFileSizeInBytes();
 	} else {
 		return 0;
 	}
@@ -76,9 +76,9 @@ void FileTransferController::start(std::string& description) {
 	fileReadStream = boost::make_shared<FileReadBytestream>(boost::filesystem::path(filename));
 	OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream);
 	if (outgoingTransfer) {
-		ftProgressInfo = new FileTransferProgressInfo(outgoingTransfer->fileSizeInBytes);
+		ftProgressInfo = new FileTransferProgressInfo(outgoingTransfer->getFileSizeInBytes());
 		ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
-		outgoingTransfer->onStateChange.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
+		outgoingTransfer->onStateChanged.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
 		outgoingTransfer->onProcessedBytes.connect(boost::bind(&FileTransferProgressInfo::setBytesProcessed, ftProgressInfo, _1));
 		outgoingTransfer->start();
 		transfer = outgoingTransfer;
@@ -93,9 +93,9 @@ void FileTransferController::accept(std::string& file) {
 	if (incomingTransfer) {
 		fileWriteStream = boost::make_shared<FileWriteBytestream>(boost::filesystem::path(file));
 
-		ftProgressInfo = new FileTransferProgressInfo(transfer->fileSizeInBytes);
+		ftProgressInfo = new FileTransferProgressInfo(transfer->getFileSizeInBytes());
 		ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
-		transfer->onStateChange.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
+		transfer->onStateChanged.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
 		transfer->onProcessedBytes.connect(boost::bind(&FileTransferProgressInfo::setBytesProcessed, ftProgressInfo, _1));
 		incomingTransfer->accept(fileWriteStream);
 	} else {
@@ -114,7 +114,10 @@ void FileTransferController::cancel() {
 void FileTransferController::handleFileTransferStateChange(FileTransfer::State state) {
 	currentState = state;
 	onStateChage();
-	switch(state.state) {
+	switch(state.type) {
+		case FileTransfer::State::Initial:
+			assert(false);
+			return;
 		case FileTransfer::State::Negotiating:
 			chatWindow->setFileTransferStatus(uiID, ChatWindow::Negotiating);
 			return;
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index ac0fee4..a661c81 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -319,9 +319,6 @@ void MainController::handleConnected() {
 	if (freshLogin) {
 		profileController_ = new ProfileController(client_->getVCardManager(), uiFactory_, uiEventStream_);
 		showProfileController_ = new ShowProfileController(client_->getVCardManager(), uiFactory_, uiEventStream_);
-		srand(static_cast<unsigned int>(time(NULL)));
-		int randomPort = 10000 + rand() % 10000;
-		client_->getFileTransferManager()->startListeningOnPort(randomPort);
 		ftOverview_ = new FileTransferOverview(client_->getFileTransferManager());
 		fileTransferListController_->setFileTransferOverview(ftOverview_);
 		rosterController_ = new RosterController(jid_, client_->getRoster(), client_->getAvatarManager(), uiFactory_, client_->getNickManager(), client_->getNickResolver(), client_->getPresenceOracle(), client_->getSubscriptionManager(), eventController_, uiEventStream_, client_->getIQRouter(), settings_, client_->getEntityCapsProvider(), ftOverview_, client_->getClientBlockListManager());
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp
index 9f7ccdc..00afacb 100644
--- a/Swift/QtUI/QtFileTransferListItemModel.cpp
+++ b/Swift/QtUI/QtFileTransferListItemModel.cpp
@@ -70,7 +70,10 @@ QVariant QtFileTransferListItemModel::data(const QModelIndex &index, int role) c
 	}
 	if (index.column() == State) {
 		FileTransfer::State state = controller->getState();
-		switch(state.state) {
+		switch(state.type) {
+			case FileTransfer::State::Initial:
+				assert(false);
+				return QVariant("");
 			case FileTransfer::State::WaitingForStart:
 				return QVariant(QObject::tr("Waiting for start"));
 			case FileTransfer::State::WaitingForAccept: