--- smsdaemon/PluginManager.cpp	2008/06/09 18:15:53	26
+++ smsdaemon/PluginManager.cpp	2008/06/10 14:38:59	35
@@ -3,7 +3,9 @@
 
 #include "common.h"
 
-#include "plugins/EchoPlugin.h"
+#include "EchoPlugin.h"
+#include "SpamPlugin.h"
+#include "ShellExecPlugin.h"
 
 
 typedef std::map<std::string, Plugin*>::iterator MapIterator;
@@ -17,21 +19,42 @@
 }
 
 
+void PluginManager::AddPlugin(Plugin* plugin)
+{
+	Common* cmn = Common::instance();
+
+	if (plugin != 0)
+	{
+		std::string command = plugin->GetCommand();
+
+		if ( _plugins[ command ] == 0)
+			_plugins[ command ] = plugin;
+		else
+			cmn->logMessage( std::string("AddPlugin() -- already have a plugin called ") + command);
+	}
+	else
+	{
+		cmn->logMessage("AddPlugin() -- cannot register a null pointer");
+	}
+}
+
 void PluginManager::LoadPlugins()
 {
 	Common* cmn = Common::instance();
 
 	static EchoPlugin echo;
-	_plugins[ echo.GetCommand() ] = &echo;
-	
+
+	static SpamPlugin spam;
+
+	static ShellExecPlugin wake("wake", "/home/torben/bin/wake");
+		
 
 	for(MapIterator it = _plugins.begin(); it != _plugins.end(); ++it)
 	{
 		Plugin* pl = (*it).second;
-		cmn->logMessage( std::string("Loaded plugin \"") + pl->GetCommand() + "\" - " + pl->GetDescription() );
+		if (pl != 0)
+			cmn->logMessage( std::string("Loaded plugin \"") + pl->GetCommand() + "\" - " + pl->GetDescription() );
 	}
-
-
 }
 
 Plugin* PluginManager::GetPlugin(const std::string& pluginname)