--- smsdaemon/main.cpp	2008/12/08 10:42:04	151
+++ smsdaemon/main.cpp	2008/12/08 21:49:49	158
@@ -2,7 +2,8 @@
 #include <stdlib.h>
 
 #include "daemon.h"
-#include "common.h"
+#include "Common.h"
+#include "Logger.h"
 
 #include "ModemTransceiver.h"
 #include "DebugTransceiver.h"
@@ -42,7 +43,7 @@
 	}
 	catch(std::exception &e)
 	{
-		cmn->logMessage( string("PortOpen Exception: ") + e.what() );
+		Logger::logMessage( string("PortOpen Exception: ") + e.what() );
 		sms_exit(1);
 	}
 
@@ -54,7 +55,7 @@
 	}
 	catch (std::exception& e)
 	{
-		cmn->logMessage( string("ModemTransceiver Exception: ") + e.what() );
+		Logger::logMessage( string("ModemTransceiver Exception: ") + e.what() );
 		sms_exit(2);
 	}
 }
@@ -71,7 +72,7 @@
 
 	//Set default values
 
-	cmn->setLogfile( "/var/log/smsdaemon.log");
+	Logger::setLogfile( "/var/log/smsdaemon.log");
 	cmn->pidfile = "/var/run/smsdaemon.pid";
 	cmn->spooldir = "/var/spool/smsdaemon";
 
@@ -83,7 +84,7 @@
 	
 	bool res = config->Open( cmn->configFilePath ) ;
 	if (!res) {
-		cmn->logMessage(string("Could not open config file:") + cmn->configFilePath);
+		Logger::logMessage(string("Could not open config file:") + cmn->configFilePath);
 		return 1;
 	}
 	
@@ -92,7 +93,7 @@
 	string transconf = config->GetValue("smsdaemon", "transceiver");
 	
 
-	if (transconf == "builtin") 
+	if (transconf == "internal") 
 	{
 		openModemPort();
 		closeModemPort();
@@ -103,7 +104,7 @@
 	}
 	else
 	{
-		cmn->logMessage( string("Invalid transceiver setting: ")+transconf);
+		Logger::logMessage( string("Invalid transceiver setting: ")+transconf);
 		exit(1);
 	}
 
@@ -117,7 +118,7 @@
 	}
 
 
-	if (transconf == "builtin")
+	if (transconf == "internal")
 	{
 		openModemPort();
 	}