Changed daemon to auto disconnect if network connection was initialized by itself.

diff --git a/Makefile b/Makefile
index 1b54f97..ba86c52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: jenirok
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat May 29 12:19:01 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Jun 2 12:04:27 2010
 # Project:  jenirok.pro
 # Template: subdirs
 # Command: /usr/bin/qmake -unix -o Makefile jenirok.pro
@@ -73,45 +73,43 @@ sub-src-daemon-install_subtargets: src/daemon/$(MAKEFILE) FORCE
 sub-src-daemon-uninstall_subtargets: src/daemon/$(MAKEFILE) FORCE
        cd src/daemon/ && $(MAKE) -f $(MAKEFILE) uninstall
 
-Makefile: jenirok.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf
+Makefile: jenirok.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf
        $(QMAKE) -unix -o Makefile jenirok.pro
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 qmake: qmake_all FORCE
        @$(QMAKE) -unix -o Makefile jenirok.pro
 

diff --git a/src/common/connectionmanager.cpp b/src/common/connectionmanager.cpp
index 07f277e..f45b0e2 100644 (file)
--- a/src/common/connectionmanager.cpp
+++ b/src/common/connectionmanager.cpp
@@ -20,13 +20,15 @@
 #include <QApplication>
 #include <QtCore/QTimerEvent>
 #include <QtCore/QVariant>
+#include <QtDBus/QDBusArgument>
 #include <icd/dbus_api.h>
 #include "connectionmanager.h"
 
 
 ConnectionManager::ConnectionManager(QObject* parent): QObject(parent),
-ready_(false), connected_(false), timeout_(false), ignoreStateChanges_(false),
-timer_(0)
+blocking_(true), stateReady_(false), connectionReady_(false), scanReady_(false),
+connected_(false), timeout_(false), numberOfConnections_(0),
+scannedConnections_(0), timer_(0), connections_(false)
 {
     QDBusConnection systemBus = QDBusConnection::systemBus();
 
@@ -42,6 +44,9 @@ timer_(0)
                       ICD_DBUS_API_INTERFACE, ICD_DBUS_API_CONNECT_SIG,
                       this, SLOT(connectionChange(const QDBusMessage&)));
 
+    systemBus.connect(ICD_DBUS_API_INTERFACE, ICD_DBUS_API_PATH,
+                      ICD_DBUS_API_INTERFACE, ICD_DBUS_API_SCAN_SIG,
+                      this, SLOT(scanResult(const QDBusMessage&)));
 
 }
 
@@ -56,28 +61,81 @@ ConnectionManager::~ConnectionManager()
     systemBus.disconnect(ICD_DBUS_API_INTERFACE, ICD_DBUS_API_PATH,
                          ICD_DBUS_API_INTERFACE, ICD_DBUS_API_CONNECT_SIG,
                          this, SLOT(connectionChange(const QDBusMessage&)));
+
+    systemBus.disconnect(ICD_DBUS_API_INTERFACE, ICD_DBUS_API_PATH,
+                         ICD_DBUS_API_INTERFACE, ICD_DBUS_API_SCAN_SIG,
+                         this, SLOT(scanResult(const QDBusMessage&)));
+}
+
+void ConnectionManager::setBlocking(bool value)
+{
+    blocking_ = value;
 }
 
 bool ConnectionManager::connect()
 {
-    ready_ = false;
-    ignoreStateChanges_ = true;
+    connectionReady_ = false;
     unsigned int flags = static_cast<unsigned int>(ICD_CONNECTION_FLAG_USER_EVENT);
     icd2interface_->call(ICD_DBUS_API_CONNECT_REQ, QVariant(flags));
-    waitSignal();
-    return connected_;
+
+    if(blocking_)
+    {
+        waitSignal(&connectionReady_);
+        return connected_;
+    }
+
+    return true;
 }
 
-bool ConnectionManager::disconnect()
+bool ConnectionManager::connect(ConnectionManager::Connection const& connection)
 {
-    if(!connected_)
+    connectionReady_ = false;
+    QDBusArgument arg;
+    arg.beginStructure();
+    arg << connection.serviceType
+        << connection.serviceAttributes
+        << connection.serviceID
+        << connection.networkType
+        << connection.networkAttributes
+        << connection.networkID;
+    arg.endStructure();
+
+    unsigned int flags = static_cast<unsigned int>(ICD_CONNECTION_FLAG_USER_EVENT);
+    QDBusMessage rep = icd2interface_->call(ICD_DBUS_API_CONNECT_REQ,
+                                            flags, arg.asVariant());
+
+    qDebug() << rep.errorName() << rep.errorMessage();
+
+    if(blocking_)
+    {
+        waitSignal(&connectionReady_);
+        return connected_;
+    }
+
+    return true;
+}
+
+bool ConnectionManager::disconnect(bool force)
+{
+    // Forced disconnect is not allowed if connection
+    // was not initialized by this class
+    if(!connected_ && force)
     {
         return false;
     }
 
-    ready_ = false;
-    ignoreStateChanges_ = false;
-    unsigned int flags = static_cast<unsigned int>(ICD_CONNECTION_FLAG_USER_EVENT);
+    connectionReady_ = false;
+    unsigned int flags;
+
+    if(force)
+    {
+        flags = static_cast<unsigned int>(ICD_CONNECTION_FLAG_UI_EVENT);
+    }
+    else
+    {
+        flags = static_cast<unsigned int>(ICD_CONNECTION_FLAG_USER_EVENT);
+    }
+
     icd2interface_->call(ICD_DBUS_API_DISCONNECT_REQ, QVariant(flags));
     connected_ = false;
     return true;
@@ -85,28 +143,54 @@ bool ConnectionManager::disconnect()
 
 bool ConnectionManager::isConnected()
 {
-    ready_ = false;
-    ignoreStateChanges_ = false;
+    stateReady_ = false;
     QDBusMessage rep = icd2interface_->call(ICD_DBUS_API_STATE_REQ);
 
     unsigned int numOfReplies = rep.arguments().value(0).value<unsigned int>();
 
     if(numOfReplies == 0)
     {
+        emit isConnectedReply(false);
         return false;
     }
 
-    waitSignal();
-    return connected_;
+    if(blocking_)
+    {
+        waitSignal(&stateReady_);
+        return connected_;
+    }
+
+    return true;
 }
 
-void ConnectionManager::stateChange(const QDBusMessage& rep)
+bool ConnectionManager::scanConnections(QList<ConnectionManager::Connection>& connections)
 {
-    if(ignoreStateChanges_)
+    unsigned int flags = static_cast<unsigned int>(ICD_SCAN_REQUEST_ACTIVE);
+    scanReady_ = false;
+    scannedConnections_ = 0;
+    connections_ = &connections;
+    QDBusMessage rep = icd2interface_->call(ICD_DBUS_API_SCAN_REQ, QVariant(flags));
+
+    numberOfConnections_ = rep.arguments().value(0).toList().size();
+
+    if(numberOfConnections_ == 0)
     {
-        return;
+        connections_ = 0;
+        return false;
     }
 
+    if(blocking_)
+    {
+        bool ret = waitSignal(&scanReady_);
+        connections_ = 0;
+        return ret;
+    }
+
+    return true;
+}
+
+void ConnectionManager::stateChange(const QDBusMessage& rep)
+{
     unsigned int status = rep.arguments().value(7).value<unsigned int>();
 
     switch(status)
@@ -115,21 +199,21 @@ void ConnectionManager::stateChange(const QDBusMessage& rep)
         break;
     case ICD_STATE_CONNECTED:
         connected_ = true;
-        ready_ = true;
+        stateReady_ = true;
         break;
     case ICD_STATE_DISCONNECTING:
         break;
     case ICD_STATE_DISCONNECTED:
         connected_ = false;
-        ready_ = true;
+        stateReady_ = true;
         break;
     case ICD_STATE_LIMITED_CONN_ENABLED:
         connected_ = true;
-        ready_ = true;
+        stateReady_ = true;
         break;
     case ICD_STATE_LIMITED_CONN_DISABLED:
         connected_ = false;
-        ready_ = true;
+        stateReady_ = true;
         break;
     case ICD_STATE_SEARCH_START:
         break;
@@ -142,6 +226,11 @@ void ConnectionManager::stateChange(const QDBusMessage& rep)
         break;
     }
 
+    if(stateReady_)
+    {
+        emit isConnectedReply(connected_);
+    }
+
 }
 
 void ConnectionManager::connectionChange(const QDBusMessage& rep)
@@ -152,35 +241,82 @@ void ConnectionManager::connectionChange(const QDBusMessage& rep)
     {
     case ICD_CONNECTION_SUCCESSFUL:
         connected_ = true;
-        ready_ = true;
+        connectionReady_ = true;
         break;
     case ICD_CONNECTION_NOT_CONNECTED:
         connected_ = false;
-        ready_ = true;
+        connectionReady_ = true;
         break;
     case ICD_CONNECTION_DISCONNECTED:
         connected_ = false;
-        ready_ = true;
+        connectionReady_ = true;
         break;
     default:
         qDebug() << "Unknown connection status";
         break;
     }
+
+    if(connectionReady_)
+    {
+        emit connectReply(connected_);
+    }
+}
+
+void ConnectionManager::scanResult(const QDBusMessage& rep)
+{
+    if(!connections_)
+    {
+        return;
+    }
+
+    QList<QVariant> args = rep.arguments();
+
+    unsigned int status = args.value(0).value<unsigned int>();
+
+    if(status == ICD_SCAN_COMPLETE)
+    {
+        scannedConnections_++;
+    }
+
+    if(scannedConnections_ >= numberOfConnections_)
+    {
+        scanReady_ = true;
+        emit scanReady();
+        return;
+    }
+
+    if(status != ICD_SCAN_NEW)
+    {
+        return;
+    }
+
+    Connection connection;
+    connection.serviceType = args.value(2).toString();
+    connection.serviceAttributes = args.value(4).value<unsigned int>();
+    connection.serviceID = args.value(5).toString();
+    connection.networkName = args.value(8).toString();
+    connection.networkType = args.value(7).toString();
+    connection.networkAttributes = args.value(9).value<unsigned int>();
+    connection.networkID = args.value(10).toByteArray();
+
+    emit newConnection(connection);
+
+    connections_->push_back(connection);
 }
 
-bool ConnectionManager::waitSignal()
+bool ConnectionManager::waitSignal(bool* ready)
 {
     timeout_ = false;
     timer_ = startTimer(TIMEOUT);
 
-    while(!ready_ && !timeout_)
+    while(!*ready && !timeout_)
     {
         QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
     }
 
     killTimer(timer_);
 
-    return ready_ || !timeout_;
+    return *ready || !timeout_;
 }
 
 void ConnectionManager::timerEvent(QTimerEvent* event)

diff --git a/src/common/connectionmanager.h b/src/common/connectionmanager.h
index e19f4e5..6c5e2a1 100644 (file)
--- a/src/common/connectionmanager.h
+++ b/src/common/connectionmanager.h
@@ -21,6 +21,9 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QTimerEvent>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusMessage>
 
@@ -29,12 +32,33 @@ class ConnectionManager : public QObject
     Q_OBJECT
 
 public:
+
+    struct Connection
+    {
+        QString serviceType;
+        unsigned int serviceAttributes;
+        QString serviceID;
+        QString networkName;
+        QString networkType;
+        unsigned int networkAttributes;
+        QByteArray networkID;
+    };
+
     ConnectionManager(QObject* parent = 0);
     ~ConnectionManager();
+    void setBlocking(bool value);
     bool connect();
-    bool disconnect();
+    bool connect(Connection const& connection);
+    bool disconnect(bool force = false);
     bool isConnected();
-    static unsigned int const TIMEOUT = 20000;
+    bool scanConnections(QList<Connection>& connections);
+    static unsigned int const TIMEOUT = 25000;
+
+signals:
+    void connectReply(bool connected);
+    void isConnectedReply(bool connected);
+    void newConnection(ConnectionManager::Connection const& connection);
+    void scanReady();
 
 protected:
     virtual void timerEvent(QTimerEvent* event);
@@ -42,14 +66,20 @@ protected:
 private slots:
     void stateChange(const QDBusMessage& rep);
     void connectionChange(const QDBusMessage& rep);
+    void scanResult(const QDBusMessage& rep);
 
 private:
-    bool waitSignal();
-    bool ready_;
+    bool waitSignal(bool* ready);
+    bool blocking_;
+    bool stateReady_;
+    bool connectionReady_;
+    bool scanReady_;
     bool connected_;
     bool timeout_;
-    bool ignoreStateChanges_;
+    int numberOfConnections_;
+    int scannedConnections_;
     int timer_;
+    QList<Connection>* connections_;
     QDBusInterface *icd2interface_;
 };
 

diff --git a/src/daemon/Makefile b/src/daemon/Makefile
index 9c61e57..fe580e7 100644 (file)
--- a/src/daemon/Makefile
+++ b/src/daemon/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: jenirokd
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat May 29 12:19:04 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Jun 2 12:04:26 2010
 # Project:  daemon.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile daemon.pro
@@ -10,12 +10,12 @@
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++ -I. -I/targets/FREMANTLE_X86/usr/include/QtCore -I/targets/FREMANTLE_X86/usr/include/QtNetwork -I/targets/FREMANTLE_X86/usr/include/QtGui -I/targets/FREMANTLE_X86/usr/include/QtSql -I/targets/FREMANTLE_X86/usr/include/QtMaemo5 -I/targets/FREMANTLE_X86/usr/include -I/targets/FREMANTLE_X86/usr/include/QtDBus -I../common -I.
+DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtSql -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I../common -I.
 LINK          = g++
-LFLAGS        = -Wl,-O1 -Wl,-rpath,/usr/lib
+LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
 LIBS          = $(SUBLIBS)  -L/usr/lib -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -L/usr/lib -lQtMaemo5 -L/usr/X11R6/lib -lQtSql -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
@@ -70,29 +70,28 @@ OBJECTS       = main.o \
                moc_eniro.o \
                moc_connectionmanager.o \
                qrc_translations.o
-DIST          = /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qdbus.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qdbus.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                daemon.pro
 QMAKE_TARGET  = jenirokd
 DESTDIR       = 
@@ -125,29 +124,28 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: daemon.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qdbus.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+Makefile: daemon.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qdbus.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                /usr/lib/libQtDBus.prl \
                /usr/lib/libQtXml.prl \
                /usr/lib/libQtCore.prl \
@@ -156,29 +154,28 @@ Makefile: daemon.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qma
                /usr/lib/libQtSql.prl \
                /usr/lib/libQtNetwork.prl
        $(QMAKE) -unix -o Makefile daemon.pro
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qdbus.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qdbus.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 /usr/lib/libQtDBus.prl:
 /usr/lib/libQtXml.prl:
 /usr/lib/libQtCore.prl:

diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index cbeb837..840d849 100644 (file)
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -124,12 +124,11 @@ void CallListener::search(Eniro::SearchDetails const& details)
     {
 
         showDelayedResult(createResult(result.name,
-                                 result.street,
-                                 result.city), BANNER_DELAY);
+                                       result.street,
+                                       result.city), BANNER_DELAY);
     }
     else
     {
-        showResult(tr("Searching..."));
         retries_ = 0;
         currentSearch_ = details.query;
 
@@ -151,6 +150,7 @@ void CallListener::search(Eniro::SearchDetails const& details)
             closeConnection_ = false;
         }
 
+        showDelayedResult(tr("Searching..."), 200);
         eniro_->search(details);
     }
 
@@ -189,7 +189,8 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
     }
     else
     {
-        message = createResult(results.at(0).name, results.at(0).street, results.at(0).city);
+        message = createResult(results.at(0).name, results.at(0).street,
+                               results.at(0).city);
         Eniro::Result result = results.at(0);
         result.number = details.query;
         Cache::instance().addItem(result);
@@ -197,18 +198,19 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
 
     retries_ = -1;
     currentSearch_ = "";
+    timedMessage_ = "";
+
+    showResult(message);
 
-    if(closeConnection_)
+    if(closeConnection_ && connectionManager_)
     {
-        connectionManager_->disconnect();
+        connectionManager_->disconnect(true);
         closeConnection_ = false;
     }
 
     delete connectionManager_;
     connectionManager_ = 0;
 
-    showResult(message);
-
 }
 
 QString CallListener::createResult(QString const& name, QString const& street, QString const& city)
@@ -276,7 +278,7 @@ void CallListener::callTerminate()
 
     if(closeConnection_ && connectionManager_)
     {
-        connectionManager_->disconnect();
+        connectionManager_->disconnect(true);
         closeConnection_ = false;
     }
 

diff --git a/src/daemon/calllistener.h b/src/daemon/calllistener.h
index 164e10b..8d098c8 100644 (file)
--- a/src/daemon/calllistener.h
+++ b/src/daemon/calllistener.h
@@ -39,7 +39,7 @@ public:
     void begin();
     void end();
     static const int REQUEST_TIMEOUT = 10000;
-    static const int BANNER_DELAY = 300;
+    static const int BANNER_DELAY = 400;
     static const int NUMBER_OF_RETRIES = 3;
 
 private slots:

diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 7613a15..a07d28e 100644 (file)
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -20,6 +20,8 @@
 #include <QtCore/QTranslator>
 #include <QtCore/QLocale>
 #include <QtCore/QString>
+#include <QtCore/QList>
+#include <QDebug>
 #include <QtGui/QApplication>
 #include "calllistener.h"
 #include "settings.h"

diff --git a/src/gui/Makefile b/src/gui/Makefile
index 5c68ad7..b22505f 100644 (file)
--- a/src/gui/Makefile
+++ b/src/gui/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: jenirok
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat May 29 12:19:04 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Jun 2 12:04:16 2010
 # Project:  gui.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile gui.pro
@@ -10,12 +10,12 @@
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++ -I. -I/targets/FREMANTLE_X86/usr/include/QtCore -I/targets/FREMANTLE_X86/usr/include/QtNetwork -I/targets/FREMANTLE_X86/usr/include/QtGui -I/targets/FREMANTLE_X86/usr/include/QtSql -I/targets/FREMANTLE_X86/usr/include/QtMaemo5 -I/targets/FREMANTLE_X86/usr/include -I../common -I.
+DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtSql -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I../common -I.
 LINK          = g++
-LFLAGS        = -Wl,-O1 -Wl,-rpath,/usr/lib
+LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
 LIBS          = $(SUBLIBS)  -L/usr/lib -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lQtSql -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
@@ -92,26 +92,25 @@ OBJECTS       = main.o \
                moc_connectionmanager.o \
                qrc_icons.o \
                qrc_translations.o
-DIST          = /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                gui.pro
 QMAKE_TARGET  = jenirok
 DESTDIR       = 
@@ -144,26 +143,25 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: gui.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+Makefile: gui.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                /usr/lib/libQtMaemo5.prl \
                /usr/lib/libQtDBus.prl \
                /usr/lib/libQtXml.prl \
@@ -172,26 +170,25 @@ Makefile: gui.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.
                /usr/lib/libQtSql.prl \
                /usr/lib/libQtNetwork.prl
        $(QMAKE) -unix -o Makefile gui.pro
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 /usr/lib/libQtMaemo5.prl:
 /usr/lib/libQtDBus.prl:
 /usr/lib/libQtXml.prl: