2 files changed, 56 insertions, 0 deletions

diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 8925803..48698b6 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -62,17 +62,25 @@ namespace OpieTooth {
         bluezOffPixmap = Resource::loadImage( "bluetoothapplet/bluezoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
         //bluezDiscoveryOnPixmap = Resource::loadImage( "bluetoothapplet/magglass" )smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
         startTimer(4000);
         btDevice = 0;
+	btManager = 0;
         bluezactive = false;
         bluezDiscoveryActive = false;
 
+	// TODO: determine whether this channel has to be closed at destruction time.
+        QCopChannel* chan = new QCopChannel("QPE/Bluetooth", this );
+        connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
+                this, SLOT(slotMessage(const QCString&,const QByteArray&) ) );
     }
 
     BluezApplet::~BluezApplet() {
         if ( btDevice ) {
             delete btDevice;
         }
+        if ( btManager ) {
+            delete btManager;
+        }
     }
 
 int BluezApplet::position()
 {
@@ -117,11 +125,54 @@ int BluezApplet::position()
         return 0;
     }
 
     int BluezApplet::checkBluezDiscoveryStatus() {
+      return bluezDiscoveryActive;
     }
 
     int BluezApplet::setBluezDiscoveryStatus(int d) {
+      return bluezDiscoveryActive=d;
+    }
+
+    // FIXME mbhaynie
+    // receiver for QCopChannel("QPE/Bluetooth") messages.
+    void BluezApplet::slotMessage( const QCString& str, const QByteArray& )
+    {
+	if ( str == "enableBluetooth()") {
+	    if (!checkBluezStatus())  {
+		setBluezStatus(1);
+	    }
+	} else if ( str == "disableBluetooth()") {
+	    if (checkBluezStatus())  {
+		// setBluezStatus(0);
+	    }
+	} else if ( str == "listDevices()") {
+	    if (!btManager)
+	    {
+		btManager = new Manager("hci0");
+		connect( btManager, SIGNAL( foundDevices(const QString&,RemoteDevice::ValueList) ),
+			 this, SLOT( fillList(const QString&,RemoteDevice::ValueList) ) ) ;
+	    }
+
+	    btManager->searchDevices();
+	}
+    }
+
+    // Once the hcitool scan is complete, report back.
+    void BluezApplet::fillList(const QString&, RemoteDevice::ValueList deviceList)
+    {
+	QCopEnvelope e("QPE/BluetoothBack", "devices(QStringMap)");
+
+	QStringList list;
+	QMap<QString, QString> btmap;
+
+        RemoteDevice::ValueList::Iterator it;
+        for( it = deviceList.begin(); it != deviceList.end(); ++it )
+	{
+	    btmap[(*it).name()] = (*it).mac();
+        }
+
+	e << btmap;
     }
 
     void BluezApplet::mousePressEvent( QMouseEvent *) {
 
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h
index a394e38..3b99c0f 100644
--- a/noncore/net/opietooth/applet/bluezapplet.h
+++ b/noncore/net/opietooth/applet/bluezapplet.h
@@ -31,8 +31,9 @@
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qtimer.h>
+#include <manager.h>
 
 namespace OpieTooth {
     class Device;
 
@@ -45,8 +46,10 @@ namespace OpieTooth {
     protected:
         void timerEvent(QTimerEvent *te );
 
 public slots:
+        void fillList( const QString& device, RemoteDevice::ValueList list );
+
     private:
         void mousePressEvent( QMouseEvent * );
         void paintEvent( QPaintEvent* );
         void launchManager();
@@ -56,15 +59,17 @@ public slots:
         int setBluezDiscoveryStatus(int);
 
     private:
         Device* btDevice;
+	Manager *btManager;
         QPixmap bluezOnPixmap;
         QPixmap bluezOffPixmap;
         QPixmap bluezDiscoveryOnPixmap;
         bool bluezactive;
         bool bluezDiscoveryActive;
 
 private slots:
+        void slotMessage( const QCString& , const QByteArray& );
 
 
     };
 };