bring QXmppTransferManager back to 3 arguments

3 files changed, 5 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f6e39e4e..e0d948f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,8 @@ QXmpp 0.7.4 (UNRELEASED)
     * Make it possible to call listenForClients and listenForServers
       multiple times to supported multiple IP address / ports.
   - Improve QXmppTransferManager:
-    * Allow StreamHost::host to contain a host name
+    * Change third argument of QXmppTransferManager::sendFile to a description.
+    * Allow StreamHost::host to contain a host name.
 
 QXmpp 0.7.3 (Sep 7, 2012)
 ------------------------
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index a6784813..b3d659ee 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -1286,7 +1286,7 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
 ///
 /// The remote party will be given the choice to accept or refuse the transfer.
 ///
-QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, const QString &filePath, const QString &sid, const QString &description)
+QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, const QString &filePath, const QString &description)
 {
     if (jid.isEmpty()) {
         warning("Refusing to send file to an empty jid");
@@ -1325,7 +1325,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, const QStri
     }
 
     // create job
-    QXmppTransferJob *job = sendFile(jid, device, fileInfo, sid);
+    QXmppTransferJob *job = sendFile(jid, device, fileInfo);
     job->setLocalFileUrl(filePath);
     return job;
 }
diff --git a/src/client/QXmppTransferManager.h b/src/client/QXmppTransferManager.h
index 71068b27..3681b8b7 100644
--- a/src/client/QXmppTransferManager.h
+++ b/src/client/QXmppTransferManager.h
@@ -257,7 +257,7 @@ signals:
     void jobFinished(QXmppTransferJob *job);
 
 public slots:
-    QXmppTransferJob *sendFile(const QString &jid, const QString &filePath, const QString &sid = QString(), const QString &description = QString());
+    QXmppTransferJob *sendFile(const QString &jid, const QString &filePath, const QString &description = QString());
     QXmppTransferJob *sendFile(const QString &jid, QIODevice *device, const QXmppTransferFileInfo &fileInfo, const QString &sid = QString());
 
 protected: