separate daemon from gui, not auto connect

[googlelatitude] / src / gps.cpp

diff --git a/src/gps.cpp b/src/gps.cpp
index a12d2ab..d8a7f53 100644 (file)
--- a/src/gps.cpp
+++ b/src/gps.cpp
@@ -25,7 +25,7 @@ GpsMaemo5::GpsMaemo5(QObject *parent) : QObject(parent) {
 void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps) {
     if (device->fix) {
         if (device->fix->fields) {
-            g_print("GpsMaemo5 lat = %f, long = %f, eph = %f\n", gps->device->fix->latitude, gps->device->fix->longitude, gps->device->fix->eph/100.);
+            g_print("GpsMaemo5 lat %f lon %f eph %f\n", gps->device->fix->latitude, gps->device->fix->longitude, gps->device->fix->eph/100.);
             gps->latitude = gps->device->fix->latitude;
             gps->longitude = gps->device->fix->longitude;
             gps->accuracy = gps->device->fix->eph/100.;
@@ -35,9 +35,8 @@ void GpsMaemo5_changed(LocationGPSDevice *device, GpsMaemo5 *gps) {
 }
 #else
 void GpsMaemo5::gloc() {
-    qDebug() << "GpsMaemo5 gloc";
     worker->post(QNetworkRequest(urlloc), QByteArray("{version:\"1.1.0\"}"));
-    QTimer::singleShot(60*1000, this, SLOT(gloc()));
+    QTimer::singleShot(45*1000, this, SLOT(gloc()));
 }
 
 void GpsMaemo5::finishedreply(QNetworkReply *r) {
@@ -49,10 +48,10 @@ void GpsMaemo5::finishedreply(QNetworkReply *r) {
         latitude = regexp.capturedTexts().at(1).toDouble();
         longitude = regexp.capturedTexts().at(2).toDouble();
         accuracy = regexp.capturedTexts().at(3).toDouble();
-        qDebug() << "GpsMaemo5 lat = " << latitude << " long = " << longitude << " acc = " << accuracy;
+        qDebug() << "GpsIP lat" << latitude << "lon" << longitude << "acc" << accuracy;
         emit fix();
     } else {
-        qDebug() << "GpsMaemo5 Error url:" << r->url();
+        qDebug() << "GpsIP Error url" << r->url();
         qDebug() << r->rawHeaderList();
         qDebug() << r->readAll();
     }