1 files changed, 7 insertions, 3 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 0635496..6b6dedf 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -45,18 +45,19 @@
 #include <QPushButton>
 #include <QFileDialog>
 #include <QMenu>
 
 #include <QDebug>
 
 namespace Swift {
 QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventStream* eventStream) : QtTabbable(), contact_(contact), previousMessageWasSelf_(false), previousMessageWasSystem_(false), previousMessageWasPresence_(false), previousMessageWasFileTransfer_(false), eventStream_(eventStream) {
 	unreadCount_ = 0;
+	idCounter_ = 0;
 	inputEnabled_ = true;
 	completer_ = NULL;
 	affiliationEditor_ = NULL;
 	theme_ = theme;
 	isCorrection_ = false;
 	correctionEnabled_ = Maybe;
 	updateTitleWithUnreadCount();
 	QtSettingsProvider settings;
 
@@ -448,19 +449,19 @@ std::string QtChatWindow::addMessage(const std::string &message, const std::stri
 
 	bool appendToPrevious = !previousMessageWasFileTransfer_ && !previousMessageWasSystem_ && !previousMessageWasPresence_ && ((senderIsSelf && previousMessageWasSelf_) || (!senderIsSelf && !previousMessageWasSelf_ && previousSenderName_ == P2QSTRING(senderName)));
 	if (lastLineTracker_.getShouldMoveLastLine()) {
 		/* should this be queued? */
 		messageLog_->addLastSeenLine();
 		/* if the line is added we should break the snippet */
 		appendToPrevious = false;
 	}
 	QString qAvatarPath =  scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.png" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
-	std::string id = id_.generateID();
+	std::string id = "id" + boost::lexical_cast<std::string>(idCounter_++);
 	messageLog_->addMessage(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(time), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id))));
 
 	previousMessageWasSelf_ = senderIsSelf;
 	previousSenderName_ = P2QSTRING(senderName);
 	previousMessageWasSystem_ = false;
 	previousMessageWasPresence_ = false;
 	previousMessageWasFileTransfer_ = false;
 	return id;
 }
@@ -494,19 +495,19 @@ std::string formatSize(const boost::uintmax_t bytes) {
 	while (engBytes >= 1000) {
 		++power;
 		engBytes = engBytes / 1000.0;
 	}
 	return str( boost::format("%.1lf %sB") % engBytes % (power > 0 ? siPrefix[power-1] : "") );
 }
 
 std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) {
 	qDebug() << "addFileTransfer";
-	std::string ft_id = id_.generateID();
+	std::string ft_id = "ft" + boost::lexical_cast<std::string>(idCounter_++);
 	
 	std::string htmlString;
 	if (senderIsSelf) {
 		// outgoing
 		htmlString = "Send file: " + filename + " ( " + formatSize(sizeInBytes) + ") </br>" +
 			"<div id='" + ft_id + "'>" +
 			"<input id='discard' type='submit' value='Cancel' onclick='filetransfer.cancel(\"" + ft_id + "\");' />" +
 			"<input id='description' type='submit' value='Set Description' onclick='filetransfer.setDescription(\"" + ft_id + "\");' />" +
 			"<input id='send' type='submit' value='Send' onclick='filetransfer.sendRequest(\"" + ft_id + "\");' />" +
@@ -524,19 +525,19 @@ std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool se
 
 	bool appendToPrevious = !previousMessageWasFileTransfer_ && !previousMessageWasSystem_ && !previousMessageWasPresence_ && ((senderIsSelf && previousMessageWasSelf_) || (!senderIsSelf && !previousMessageWasSelf_ && previousSenderName_ == P2QSTRING(senderName)));
 	if (lastLineTracker_.getShouldMoveLastLine()) {
 		/* should this be queued? */
 		messageLog_->addLastSeenLine();
 		/* if the line is added we should break the snippet */
 		appendToPrevious = false;
 	}
 	QString qAvatarPath = "qrc:/icons/avatar.png";
-	std::string id = id_.generateID();
+	std::string id = "ftmessage" + boost::lexical_cast<std::string>(idCounter_++);
 	messageLog_->addMessage(boost::shared_ptr<ChatSnippet>(new MessageSnippet(QString::fromStdString(htmlString), Qt::escape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id))));
 
 
 	return ft_id;
 }
 
 void QtChatWindow::setFileTransferProgress(std::string id, const int percentageDone) {
 	messageLog_->setFileTransferProgress(QString::fromStdString(id), percentageDone);
 }
@@ -607,18 +608,21 @@ void QtChatWindow::addSystemMessage(const std::string& message) {
 }
 
 void QtChatWindow::replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time) {
 	if (!id.empty()) {
 		QString messageHTML(Qt::escape(P2QSTRING(message)));
 		messageHTML = P2QSTRING(Linkify::linkify(Q2PSTRING(messageHTML)));
 		messageHTML.replace("\n","<br/>");
 		messageLog_->replaceMessage(messageHTML, P2QSTRING(id), B2QDATE(time));
 	}
+	else {
+		qWarning() << "Trying to replace a message with no id";
+	}
 }
 
 void QtChatWindow::addPresenceMessage(const std::string& message) {
 	if (isWidgetSelected()) {
 		onAllMessagesRead();
 	}
 
 	QString messageHTML(Qt::escape(P2QSTRING(message)));
 	messageHTML = P2QSTRING(Linkify::linkify(Q2PSTRING(messageHTML)));