--- a/qtmobility/src/location/dbusserver_maemo.cpp	Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/src/location/dbusserver_maemo.cpp	Thu May 27 13:42:11 2010 +0300
@@ -43,15 +43,9 @@
 
 QTM_BEGIN_NAMESPACE
 
-void DBusServer::setHandlerObject(DBusComm* p)
+DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj), 
+                                                            interface(iface) 
 {
-    handler = p;
-}
-
-
-DBusServer::DBusServer(QObject *obj) : QDBusAbstractAdaptor(obj)
-{
-    handler = 0;
 }
 
 
@@ -61,23 +55,34 @@
     QDataStream stream(message);
     stream >> update;
 
-    if (handler != 0) {
-        handler->receivePositionUpdate(update);
-    }
-
-    return;
+    interface->receivePositionUpdate(update);
 }
 
 
 Q_NOREPLY void DBusServer::currentSettings(const QGeoPositionInfoSource::PositioningMethod methods,
-        const int interval)
+                                           int interval)
+{
+    interface->receiveSettings(methods, interval);
+}
+
+
+Q_NOREPLY void DBusServer::satellitesInViewUpdate(const QByteArray &message)
 {
-    if (handler != 0) {
-        handler->receiveSettings(methods, interval);
-    }
+    static QList<QGeoSatelliteInfo> update;
+    QDataStream stream(message);
+    stream >> update;
+
+    interface->receiveSatellitesInView(update);
+}
+
 
-    return;
+Q_NOREPLY void DBusServer::satellitesInUseUpdate(const QByteArray &message)
+{
+    static QList<QGeoSatelliteInfo> update;
+    QDataStream stream(message);
+    stream >> update;
 
+    interface->receiveSatellitesInUse(update);
 }
 
 #include "moc_dbusserver_maemo_p.cpp"