Architecture changed to allow easier addition of new phone books. Norwegian phonebook...

[jenirok] / src / daemon / main.cpp

diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 7dc2b01..f011649 100644 (file)
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -16,17 +16,15 @@
  *
  */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTranslator>
-#include <QtCore/QLocale>
+#include <QtCore/QString>
 #include <QtGui/QApplication>
 #include "calllistener.h"
 #include "settings.h"
 
 int main(int argc, char *argv[])
 {
-    // If daemon was started on boot, the first parameter is not set
-    if(!(argc >= 2 && argv[1] == "manual"))
+    // If daemon was started on boot, the first parameter is set to "-boot"
+    if(argc >= 2 && QString(argv[1]) == "-boot")
     {
         if(Settings::instance()->get("autostart") == "0")
         {
@@ -37,13 +35,14 @@ int main(int argc, char *argv[])
 
     QApplication app(argc, argv);
 
-    QTranslator translator;
-    translator.load(":/translations/" + QLocale::system().name());
-    app.installTranslator(&translator);
+    Settings::instance()->loadLanguage(app);
 
     CallListener listener;
 
-    listener.begin();
+    if(!listener.begin())
+    {
+        return 1;
+    }
 
     return app.exec();