summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp34
1 files changed, 14 insertions, 20 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 6e5ee82..94e29c7 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -57,3 +57,4 @@ namespace OpieTooth {
57 startTimer(5000); 57 startTimer(5000);
58 timerEvent(NULL); 58 btDevice = 0;
59
59 } 60 }
@@ -64,5 +65,8 @@ namespace OpieTooth {
64 int BluezApplet::checkBluezStatus() { 65 int BluezApplet::checkBluezStatus() {
65 if (btDevice) { 66 if (btDevice) {
66 if (btDevice->isLoaded() ) { 67 if (btDevice->isLoaded() ) {
67 return 1; 68 return 1;
69 } else {
70 return 0;
71 }
68 } else { 72 } else {
@@ -70,5 +74,2 @@ namespace OpieTooth {
70 } 74 }
71 } else {
72 return 0;
73 }
74 } 75 }
@@ -79,4 +80,2 @@ namespace OpieTooth {
79 btDevice = new Device("/dev/ttySB0", "csr" ); 80 btDevice = new Device("/dev/ttySB0", "csr" );
80 // system("hciattach /dev/ttySB0 csr");
81 //system("hcid");
82 } else { 81 } else {
@@ -84,6 +83,5 @@ namespace OpieTooth {
84 delete btDevice; 83 delete btDevice;
84 btDevice = 0;
85 } 85 }
86 //system("killall hciattach"); 86 }
87 //system("killall hcid");
88 }
89 return 0; 87 return 0;
@@ -124,3 +122,3 @@ namespace OpieTooth {
124 } 122 }
125 //menu->insertItem( tr("More..."), 7 ) 123
126 124
@@ -129,4 +127,2 @@ namespace OpieTooth {
129 127
130 // qDebug("ret was %d\n", ret);
131
132 switch(ret) { 128 switch(ret) {
@@ -134,3 +130,2 @@ namespace OpieTooth {
134 setBluezStatus(0); 130 setBluezStatus(0);
135 timerEvent(NULL);
136 break; 131 break;
@@ -138,3 +133,2 @@ namespace OpieTooth {
138 setBluezStatus(1); 133 setBluezStatus(1);
139 timerEvent(NULL);
140 break; 134 break;
@@ -143,3 +137,2 @@ namespace OpieTooth {
143 launchManager(); 137 launchManager();
144 timerEvent(NULL);
145 break; 138 break;
@@ -147,3 +140,2 @@ namespace OpieTooth {
147 setBluezDiscoveryStatus(0); 140 setBluezDiscoveryStatus(0);
148 timerEvent(NULL);
149 break; 141 break;
@@ -151,3 +143,2 @@ namespace OpieTooth {
151 setBluezDiscoveryStatus(1); 143 setBluezDiscoveryStatus(1);
152 timerEvent(NULL);
153 break; 144 break;
@@ -156,2 +147,5 @@ namespace OpieTooth {
156 } 147 }
148
149 timerEvent(NULL);
150 delete signal;
157 delete menu; 151 delete menu;