4 files changed, 29 insertions, 12 deletions
diff --git a/Swiften/EventLoop/DummyEventLoop.cpp b/Swiften/EventLoop/DummyEventLoop.cpp
new file mode 100644
index 0000000..3741eec
--- /dev/null
+++ b/Swiften/EventLoop/DummyEventLoop.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/EventLoop/DummyEventLoop.h>
+
+#include <iostream>
+
+namespace Swift {
+
+DummyEventLoop::DummyEventLoop() {
+}
+
+DummyEventLoop::~DummyEventLoop() {
+	if (!events_.empty()) {
+		std::cerr << "DummyEventLoop: Unhandled events at destruction time" << std::endl;
+	}
+	events_.clear();
+}
+
+
+}
diff --git a/Swiften/EventLoop/DummyEventLoop.h b/Swiften/EventLoop/DummyEventLoop.h
index b7ef516..68f9b85 100644
--- a/Swiften/EventLoop/DummyEventLoop.h
+++ b/Swiften/EventLoop/DummyEventLoop.h
@@ -7,24 +7,14 @@
 #pragma once
 
 #include <deque>
-#include <iostream>
-#include <boost/function.hpp>
 
 #include "Swiften/EventLoop/EventLoop.h"
-#include "Swiften/Base/foreach.h"
 
 namespace Swift {
 	class DummyEventLoop : public EventLoop {
 		public:
-			DummyEventLoop() {
-			}
-
-			~DummyEventLoop() {
-				if (!events_.empty()) {
-					std::cerr << "DummyEventLoop: Unhandled events at destruction time" << std::endl;
-				}
-				events_.clear();
-			}
+			DummyEventLoop();
+			~DummyEventLoop();
 
 			void processEvents() {
 				while (!events_.empty()) {
diff --git a/Swiften/EventLoop/EventLoop.cpp b/Swiften/EventLoop/EventLoop.cpp
index 56bb6ac..510ed63 100644
--- a/Swiften/EventLoop/EventLoop.cpp
+++ b/Swiften/EventLoop/EventLoop.cpp
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <boost/bind.hpp>
 #include <iostream>
+#include <cassert>
 
 #include <Swiften/Base/Log.h>
 
@@ -17,6 +18,7 @@ namespace Swift {
 
 inline void invokeCallback(const Event& event) {
 	try {
+		assert(!event.callback.empty());
 		event.callback();
 	}
 	catch (const std::exception& e) {
diff --git a/Swiften/EventLoop/SConscript b/Swiften/EventLoop/SConscript
index 21ae8b9..e448f43 100644
--- a/Swiften/EventLoop/SConscript
+++ b/Swiften/EventLoop/SConscript
@@ -5,6 +5,7 @@ sources = [
 		"EventOwner.cpp",
 		"Event.cpp",
 		"SimpleEventLoop.cpp",
+		"DummyEventLoop.cpp",
 	]
 
 objects = swiften_env.SwiftenObject(sources)