From b06a06a40ebbd9b22e26ecfa56baa03c6af51963 Mon Sep 17 00:00:00 2001
From: Rodrigo Linfati <rodrigo@linfati.cl>
Date: Thu, 28 Jul 2011 14:22:17 +0200
Subject: [PATCH] Use only /opt/linfati.com, fix daemon

---
 deployment.pri     |    2 +-
 latitudeqml.cpp    |    7 +++----
 latitudeqml.h      |   15 ++++-----------
 latitudewidget.cpp |    7 +++----
 latitudewidget.h   |   20 ++++++++------------
 5 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/deployment.pri b/deployment.pri
index f147e99..266eed3 100644
--- a/deployment.pri
+++ b/deployment.pri
@@ -81,7 +81,7 @@ symbian {
             QMAKE_EXTRA_TARGETS += first copydeploymentfolders
         }
     }
-    installPrefix = /opt/$${TARGET}
+    installPrefix = /opt/linfati.com
     for(deploymentfolder, DEPLOYMENTFOLDERS) {
         item = item$${deploymentfolder}
         itemfiles = $${item}.files
diff --git a/latitudeqml.cpp b/latitudeqml.cpp
index 3ae61c0..69b5ba8 100644
--- a/latitudeqml.cpp
+++ b/latitudeqml.cpp
@@ -5,10 +5,9 @@ LatitudeQML::LatitudeQML(QDeclarativeView *parent) :
     QDeclarativeView(parent),
     latitude(this),
     gps(this),
-    demonioOpt("/opt/LatitudeUpdaterDaemon/bin/LatitudeUpdaterDaemon"),
-    demonioSdk(QCoreApplication::applicationDirPath()+
-        QDir::separator()+
-        "LatitudeUpdaterDaemon"),
+    demonio(QCoreApplication::applicationDirPath()
+        + QDir::separator()
+        + "LatitudeUpdaterDaemon"),
     cli(this) {
     qDebug() << "* LatitudeQML::LatitudeQML";
 
diff --git a/latitudeqml.h b/latitudeqml.h
index c868551..82db1f4 100644
--- a/latitudeqml.h
+++ b/latitudeqml.h
@@ -27,14 +27,8 @@ public slots:
     }
     bool demonio_start() {
         qDebug() << "LatitudeQML::demonio_start";
-        if (demonioOpt.exists()) {
-            qDebug() << "LatitudeQML:: demonio opt";
-            cli.startDetached(demonioOpt.fileName());
-            return true;
-        }
-        if (demonioSdk.exists()) {
-            qDebug() << "LatitudeQML:: demonio sdk";
-            cli.startDetached(demonioSdk.fileName());
+        if (demonio.exists()) {
+            cli.startDetached(demonio.fileName());
             return true;
         }
         qDebug() << "LatitudeQML:: demonio none";
@@ -42,7 +36,7 @@ public slots:
     }
     bool demonio_stop() {
         qDebug() << "LatitudeQML::demonio_stop";
-        if (demonioOpt.exists() || demonioSdk.exists() ) {
+        if (demonio.exists()) {
             qDebug() << "LatitudeQML:: demonio kill" << system("killall LatitudeUpdaterDaemon 2> /dev/null");
             return true;
         }
@@ -54,8 +48,7 @@ private slots:
 private:
     GoogleLatitude latitude;
     GpsControl gps;
-    QFile demonioOpt;
-    QFile demonioSdk;
+    QFile demonio;
     QProcess cli;
 };
 
diff --git a/latitudewidget.cpp b/latitudewidget.cpp
index 6b754d9..37f4e50 100644
--- a/latitudewidget.cpp
+++ b/latitudewidget.cpp
@@ -4,10 +4,9 @@ LatitudeGUI::LatitudeGUI(QWidget *parent) :
     QWidget(parent),
     latitude(this),
     gps(this),
-    demonioOpt("/opt/LatitudeUpdaterDaemon/bin/LatitudeUpdaterDaemon"),
-    demonioSdk(QCoreApplication::applicationDirPath()+
-        QDir::separator()+
-        "LatitudeUpdaterDaemon"),
+    demonio(QCoreApplication::applicationDirPath()
+        + QDir::separator()
+        + "LatitudeUpdaterDaemon"),
     cli(this) {
     qDebug() << "* LatitudeGUI::LatitudeGUI";
     setWindowTitle(tr("LatitudeUpdater"));
diff --git a/latitudewidget.h b/latitudewidget.h
index d626f6f..6821240 100644
--- a/latitudewidget.h
+++ b/latitudewidget.h
@@ -57,22 +57,19 @@ private slots:
         qDebug() << "* LatitudeGUI::gps_start";
         do_start->setDisabled(true);
         do_stop->setEnabled(true);
-        if (demonioOpt.exists()) {
-            qDebug() << "* LatitudeGUI:: demonio opt";
-            cli.startDetached(demonioOpt.fileName());
-        } else if (demonioSdk.exists()) {
-            qDebug() << "* LatitudeGUI:: demonio sdk";
-            cli.startDetached(demonioSdk.fileName());
-        } else {
-            qDebug() << "* LatitudeGUI:: demonio none";
-            gps.startUpdates();
+        if (demonio.exists()) {
+            qDebug() << "* LatitudeGUI:: demonio";
+            cli.startDetached(demonio.fileName());
+            return;
         }
+        qDebug() << "* LatitudeGUI:: demonio none";
+        gps.startUpdates();
     }
     void gps_stop() {
         qDebug() << "* LatitudeGUI::gps_stop";
         do_start->setEnabled(true);
         do_stop->setDisabled(true);
-        if (demonioOpt.exists() || demonioSdk.exists() ) {
+        if (demonio.exists()) {
             qDebug() << "* LatitudeGUI:: demonio kill" << system("killall LatitudeUpdaterDaemon 2> /dev/null");
         } else {
             gps.stopUpdates(true);
@@ -114,8 +111,7 @@ private slots:
 private:
     GoogleLatitude latitude;
     GpsControl gps;
-    QFile demonioOpt;
-    QFile demonioSdk;
+    QFile demonio;
     QProcess cli;
 
     QHBoxLayout *layout_row1;
-- 
1.7.9.5