From 6ee849a7da7ec691ec3367c825c78349ad993607 Mon Sep 17 00:00:00 2001
From: "matthias.ringwald"
 <matthias.ringwald@1a0a8af8-31b5-11de-8e0c-53a27eea117e>
Date: Wed, 30 Sep 2009 20:37:28 +0000
Subject: [PATCH] clarify event for Bluetooth status bar icon

---
 src/daemon.c | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/daemon.c b/src/daemon.c
index 42d35c64d..9bb97f819 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -142,20 +142,36 @@ static int daemon_client_handler(connection_t *connection, uint16_t packet_type,
 }
 
 static void daemon_event_handler(uint8_t *packet, uint16_t size){
+    // local cache
+    static HCI_STATE hci_state = HCI_STATE_OFF;
+    static int num_connections = 0;
+    
+    uint8_t update_status = 0;
+    
     // handle state event
-    if (packet[0] == BTSTACK_EVENT_STATE){
-        if (packet[2] == HCI_STATE_WORKING) {
-            bluetooth_status_handler(BLUETOOTH_ON);
-        }
-        if (packet[2] == HCI_STATE_OFF) {
-            bluetooth_status_handler(BLUETOOTH_OFF);
-        }
+    switch (packet[0]) {
+        case BTSTACK_EVENT_STATE:
+            hci_state = packet[2];
+            update_status = 1;
+            break;
+        case BTSTACK_EVENT_NR_CONNECTIONS_CHANGED:
+            num_connections = packet[2];
+            update_status = 1;
+            break;
+        default:
+            break;
     }
-    if (packet[0] == BTSTACK_EVENT_NR_CONNECTIONS_CHANGED){
-        if (packet[2]) {
-            bluetooth_status_handler(BLUETOOTH_ACTIVE);
+    
+    // choose full bluetooth state 
+    if (update_status) {
+        if (hci_state != HCI_STATE_WORKING) {
+            bluetooth_status_handler(BLUETOOTH_OFF);
         } else {
-            bluetooth_status_handler(BLUETOOTH_ON);
+            if (num_connections) {
+                bluetooth_status_handler(BLUETOOTH_ACTIVE);
+            } else {
+                bluetooth_status_handler(BLUETOOTH_ON);
+            }
         }
     }