--- smsdaemon/PluginManager.cpp	2008/12/07 11:08:31	137
+++ smsdaemon/PluginManager.cpp	2008/12/12 14:06:11	184
@@ -1,7 +1,7 @@
 	
 #include "PluginManager.h"
 
-#include "common.h"
+#include "Logger.h"
 
 #include "plugins/EchoPlugin.h"
 #include "plugins/SpamPlugin.h"
@@ -24,27 +24,30 @@
 
 void PluginManager::AddPlugin(Plugin* plugin)
 {
-	Common* cmn = Common::instance();
-
 	if (plugin != 0)
 	{
-		std::string command = plugin->GetCommand();
-
-		if ( _plugins[ command ] == 0)
-			_plugins[ command ] = plugin;
+		if (plugin->IsHelper())
+		{
+			_helper_plugins.push_back(plugin);
+		}
 		else
-			cmn->logMessage( std::string("AddPlugin() -- already have a plugin called ") + command);
+		{
+			std::string command = plugin->GetCommand();
+
+			if ( _plugins[ command ] == 0)
+				_plugins[ command ] = plugin;
+			else
+				Logger::logMessage( std::string("AddPlugin() -- already have a plugin called ") + command);
+		}
 	}
 	else
 	{
-		cmn->logMessage("AddPlugin() -- cannot register a null pointer");
+		Logger::logMessage("AddPlugin() -- cannot register a null pointer");
 	}
 }
 
 void PluginManager::LoadPlugins()
 {
-	Common* cmn = Common::instance();
-
 	static EchoPlugin echo;
 
 	static SpamPlugin spam;
@@ -64,7 +67,7 @@
 	{
 		Plugin* pl = (*it).second;
 		if (pl != 0)
-			cmn->logMessage( std::string("Loaded plugin \"") + pl->GetCommand() + "\" - " + pl->GetDescription() );
+			Logger::logMessage( std::string("Loaded plugin \"") + pl->GetCommand() + "\" - " + pl->GetDescription() );
 	}
 }