1 files changed, 9 insertions, 8 deletions
diff --git a/Swiften/Examples/EchoBot/EchoBot.cpp b/Swiften/Examples/EchoBot/EchoBot.cpp
index 9d11c61..1c576c9 100644
--- a/Swiften/Examples/EchoBot/EchoBot.cpp
+++ b/Swiften/Examples/EchoBot/EchoBot.cpp
@@ -3,42 +3,40 @@
 * Licensed under the GNU General Public License v3.
 * See Documentation/Licenses/GPLv3.txt for more information.
 */
 #include <boost/bind.hpp>
+#include <iostream>
 #include "Swiften/Client/Client.h"
-#include "Swiften/Client/ClientXMLTracer.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include "Swiften/Queries/Requests/GetRosterRequest.h"
 using namespace Swift;
 using namespace boost;
 class EchoBot {
        public:
-                EchoBot(const JID& jid, const String& pass) : tracer(0) {
+                EchoBot(const JID& jid, const String& pass) {
                        client = new Client(jid, pass);
-                        tracer = new ClientXMLTracer(client);
                        client->onConnected.connect(bind(&EchoBot::handleConnected, this));
                        client->onMessageReceived.connect(bind(&EchoBot::handleMessageReceived, this, _1));
                        client->connect();
                }
                ~EchoBot() {
-                        delete tracer;
                        delete client;
                }
        private:
                void handleConnected() {
                        shared_ptr<GetRosterRequest> rosterRequest(new GetRosterRequest(client));
                        rosterRequest->onResponse.connect(bind(&EchoBot::handleRosterReceived, this, _2));
                        rosterRequest->send();
                }
-                void handleRosterReceived(const optional<Error>& error) {
+                void handleRosterReceived(const optional<ErrorPayload>& error) {
                        if (error) {
                                std::cerr << "Error receiving roster. Continuing anyway.";
                        }
                        client->sendPresence(shared_ptr<Presence>(new Presence("Send me a message")));
                }
@@ -49,14 +47,17 @@ class EchoBot {
                        client->sendMessage(message);
                }
        private:
                Client* client;
-                ClientXMLTracer* tracer;
 };
-int main(int, char**) {
+int main(int argc, char* argv[]) {
+        if (argc != 3) {
+                std::cerr << "Usage: " << argv[0] << " <jid> <pass>" << std::endl;
+                return -1;
+        }
        SimpleEventLoop eventLoop;
-        EchoBot bot(JID("echobot@wonderland.lit"), "mypass");
+        EchoBot bot(JID(argv[1]), argv[2]);
        eventLoop.run();
        return 0;
 }