X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdaemon%2Fmain.cpp;h=f0116490f464cc56a01e276af0d0e84f5b706d9b;hb=d187495fd3566da1ee1eb94cc313c2f561a0fac5;hp=e069e26e9eabd1cc6d9f8d008858f8a625516fe8;hpb=89496ceee9788c2908c27ad4e2535f2728310d76;p=jenirok

diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index e069e26..f011649 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -16,23 +16,33 @@
  *
  */
 
-#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 set to "-boot"
+    if(argc >= 2 && QString(argv[1]) == "-boot")
+    {
+        if(Settings::instance()->get("autostart") == "0")
+        {
+            // Autostart is disabled -> exit
+            return 0;
+        }
+    }
+
     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();