--- /dev/null
+HEADERS += src/glatitude.h src/gps.h
+SOURCES += src/glatitude.cpp src/gps.cpp
+
+OBJECTS_DIR = build
+MOC_DIR = build
+DESTDIR = build
+
+TEMPLATE = app
+
+QT += network
+
+contains(QT_CONFIG, maemo5) {
+ QT += maemo5
+ CONFIG += link_pkgconfig
+ PKGCONFIG += glib-2.0 liblocation
+}
--- /dev/null
+include(GoogleLatitudeCommon.pri)
+TARGET = GoogleLatitudeDaemon
+HEADERS += src/daemon.h
+SOURCES += src/daemon.cpp src/main-daemon.cpp
+
+QT -= gui
--- /dev/null
+include(GoogleLatitudeCommon.pri)
+TARGET = GoogleLatitudeGUI
+HEADERS += src/latitude.h
+SOURCES += src/latitude.cpp src/main-gui.cpp
+
+QT += webkit
Encoding=UTF-8
Version=1.0
Type=Application
-Name=Google Latitude Update
-Exec=/opt/linfati.com/googlelatitude
+Name=Google Latitude And Buzz
+Exec=/opt/linfati.com/GoogleLatitudeGUI
Icon=googlelatitude
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable
data/googlelatitude.desktop usr/share/applications/hildon
data/googlelatitude.png usr/share/icons/hicolor/64x64/apps
-build/googlelatitude opt/linfati.com
build/GoogleLatitudeGUI opt/linfati.com
build/GoogleLatitudeDaemon opt/linfati.com
dh_clean -k
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/$(APPNAME) install
- ln -s googlelatitude build/GoogleLatitudeGUI
- ln -s googlelatitude build/GoogleLatitudeDaemon
binary-indep: build install
binary-arch: build install
-TARGET = googlelatitude
-HEADERS += src/latitude.h src/glatitude.h src/gps.h src/daemon.h
-SOURCES += src/main.cpp src/latitude.cpp src/glatitude.cpp src/gps.cpp src/daemon.cpp
-
-OBJECTS_DIR = build
-MOC_DIR = build
-DESTDIR = build
-
-TEMPLATE = app
-QT += core gui network webkit
-
-contains(QT_CONFIG, maemo5) {
- QT += maemo5
- CONFIG += link_pkgconfig
- PKGCONFIG += glib-2.0 liblocation
-}
+TEMPLATE = subdirs
+SUBDIRS += GoogleLatitudeDaemon.pro
+SUBDIRS += GoogleLatitudeGUI.pro
longitude = lo;
accuracy = ac;
- qDebug() << "GoogleLatitude: set la = " << la << " lo = " << lo << " ac = " << ac;
- qDebug() << "GoogleLatitude: set lastupdate = " << lastupdate << " current = " << QDateTime::currentDateTime().toUTC().toTime_t();
+ qDebug() << "GoogleLatitude: set la" << la << "lo" << lo << "ac" << ac << "current" << QDateTime::currentDateTime().toUTC().toTime_t();
if (login_error) return;
if (la*lo == 0) return;
if ( QDateTime::currentDateTime().toUTC().toTime_t() < lastupdate + interval ) return;
+
+ QNetworkConfigurationManager mgr;
+ if (!mgr.isOnline()) {
+ qDebug() << "GoogleLatitude: offline";
+ return;
+ }
+
worker->get(QNetworkRequest(urllogin));
}
QString output = r->readAll();
QRegExp regexp ("Authentication required");
if (regexp.indexIn(output, 1) != -1) {
- qDebug() << "GoogleLatitude: update error";
+ qDebug() << "GoogleLatitude: update error auth";
login_error = true;
emit ERROR();
} else {
lastupdate = QDateTime::currentDateTime().toUTC().toTime_t();
- qDebug() << "GoogleLatitude: update ok " << "lastupdate = " << lastupdate;
+ qDebug() << "GoogleLatitude: update ok" << "lastupdate" << lastupdate;
emit OK();
}
} else {
- qDebug() << "GoogleLatitude Error url:" << r->url();
+ qDebug() << "GoogleLatitude Error url" << r->url();
qDebug() << r->rawHeaderList();
qDebug() << r->readAll();
}
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.;
}
#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) {
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();
}
} else {
QProcess *cli = new QProcess(this);
cli->start(QCoreApplication::applicationDirPath()+"/GoogleLatitudeDaemon");
- qDebug() << "LatitudeGUI: demonio " << QCoreApplication::applicationDirPath()+"/GoogleLatitudeDaemon";
+ qDebug() << "LatitudeGUI: demonio" << QCoreApplication::applicationDirPath()+"/GoogleLatitudeDaemon";
if ( ! system("killall -0 GoogleLatitudeDaemon 2> /dev/null" ) ) {
demonio->setText(tr("&Stop Daemon"));
}
--- /dev/null
+#include "daemon.h"
+
+int main(int argc, char *argv[]) {
+ QCoreApplication::setOrganizationName("linfati");
+ QCoreApplication::setOrganizationDomain("linfati.com");
+ QCoreApplication::setApplicationName("GoogleLatitude");
+
+ QCoreApplication app(argc, argv);
+ Daemon *demonio;
+ demonio = new Daemon();
+
+ return app.exec();
+}
--- /dev/null
+#include "latitude.h"
+
+int main(int argc, char *argv[]) {
+ QCoreApplication::setOrganizationName("linfati");
+ QCoreApplication::setOrganizationDomain("linfati.com");
+ QCoreApplication::setApplicationName("GoogleLatitude");
+
+ QApplication app(argc, argv);
+ LatitudeGUI *gui = new LatitudeGUI();
+ gui->show();
+
+ return app.exec();
+}
+++ /dev/null
-#include "latitude.h"
-#include "daemon.h"
-
-int main(int argc, char *argv[]) {
- QCoreApplication::setOrganizationName("linfati");
- QCoreApplication::setOrganizationDomain("linfati.com");
- QCoreApplication::setApplicationName("GoogleLatitude");
- QCoreApplication::setApplicationVersion("0.4.5");
-
- if ( QString(argv[0]).contains("GoogleLatitudeDaemon") ) {
- QCoreApplication app(argc, argv);
- qDebug() << "main: Daemon";
- Daemon *demonio;
- demonio = new Daemon();
- app.exec();
- } else if ( QString(argv[0]).contains("GoogleLatitudeGUI") ) {
- QApplication app(argc, argv);
- qDebug() << "main: GUI";
- LatitudeGUI *gui = new LatitudeGUI();
- gui->show();
- app.exec();
- } else {
- QApplication app(argc, argv);
- qDebug() << "main: default";
- LatitudeGUI *gui = new LatitudeGUI();
- gui->show();
- app.exec();
- }
-
- return 0;
-}