update

2 files changed, 12 insertions, 7 deletions

diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 94e29c7..8bb7a93 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -61,17 +61,17 @@ namespace OpieTooth {
 
     BluezApplet::~BluezApplet() {
     }
 
-    int BluezApplet::checkBluezStatus() {
+    bool BluezApplet::checkBluezStatus() {
         if (btDevice) {
             if (btDevice->isLoaded() ) {
-                return 1;
+                return true;
             } else {
-                return 0;
+                return false;
             }
         } else {
-            return 0;
+            return false;
         }
     }
 
     int BluezApplet::setBluezStatus(int c) {
@@ -127,21 +127,26 @@ namespace OpieTooth {
 
         switch(ret) {
         case 0:
             setBluezStatus(0);
+            timerEvent(NULL);
             break;
         case 1:
             setBluezStatus(1);
+            timerEvent(NULL);
             break;
         case 2:
             // start bluetoothmanager
             launchManager();
+            timerEvent(NULL);
             break;
         case 3:
             setBluezDiscoveryStatus(0);
+            timerEvent(NULL);
             break;
         case 4:
             setBluezDiscoveryStatus(1);
+            timerEvent(NULL);
             break;
             //case 7:
             // With table of currently-detected devices.
         }
@@ -164,9 +169,9 @@ namespace OpieTooth {
  * Refresh timer
  * @param the timer event
  */
     void BluezApplet::timerEvent( QTimerEvent * ) {
-        int oldactive = bluezactive;
+        bool oldactive = bluezactive;
         int olddiscovery = bluezDiscoveryActive;
 
         bluezactive = checkBluezStatus();
         bluezDiscoveryActive = checkBluezDiscoveryStatus();
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h
index da05a18..6a8a00e 100644
--- a/noncore/net/opietooth/applet/bluezapplet.h
+++ b/noncore/net/opietooth/applet/bluezapplet.h
@@ -49,9 +49,9 @@ public slots:
     private:
         void mousePressEvent( QMouseEvent * );
         void paintEvent( QPaintEvent* );
         void launchManager();
-        int checkBluezStatus();
+        bool checkBluezStatus();
         int setBluezStatus(int);
         int checkBluezDiscoveryStatus();
         int setBluezDiscoveryStatus(int);
         int sockfd;
@@ -60,9 +60,9 @@ public slots:
         Device* btDevice;
         QPixmap bluezOnPixmap;
         QPixmap bluezOffPixmap;
         QPixmap bluezDiscoveryOnPixmap;
-        int bluezactive;
+        bool bluezactive;
         int bluezDiscoveryActive;
 
 private slots: