author | korovkin <korovkin> | 2006-05-09 12:38:24 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-05-09 12:38:24 (UTC) |
commit | 620d55ae3b94fa8d2fa696b6626893e4520c3a02 (patch) (unidiff) | |
tree | ca1296808dfac6fa6c74086f4dda6af525d7b151 /noncore/net | |
parent | dc719be35432469c24dd8d10136c1ea25c6861d2 (diff) | |
download | opie-620d55ae3b94fa8d2fa696b6626893e4520c3a02.zip opie-620d55ae3b94fa8d2fa696b6626893e4520c3a02.tar.gz opie-620d55ae3b94fa8d2fa696b6626893e4520c3a02.tar.bz2 |
Instead of calling a process, do ::system on stop and use QCopEnvelope on start.
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 56 | ||||
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.h | 2 |
2 files changed, 16 insertions, 42 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 9c6c71d..90b0c6d 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -56,5 +56,5 @@ using namespace Opie::Core; | |||
56 | #include <device.h> | 56 | #include <device.h> |
57 | 57 | ||
58 | // #define OPIE120 // undefine it fo the latest OPIE | 58 | #define OPIE120 // undefine it fo the latest OPIE |
59 | 59 | ||
60 | namespace OpieTooth { | 60 | namespace OpieTooth { |
@@ -84,14 +84,5 @@ namespace OpieTooth { | |||
84 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), | 84 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), |
85 | this, SLOT(slotMessage(const QCString&,const QByteArray&) ) ); | 85 | this, SLOT(slotMessage(const QCString&,const QByteArray&) ) ); |
86 | 86 | ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); | |
87 | OProcess* btstart = new OProcess(); | ||
88 | *btstart << "/etc/init.d/bluetooth" << "stop"; | ||
89 | btstart->setUseShell(true); | ||
90 | if (!btstart->start(OProcess::DontCare, OProcess::AllOutput)) | ||
91 | delete btstart; | ||
92 | else { | ||
93 | connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)), | ||
94 | this, SLOT(slotProcessExited(Opie::Core::OProcess*))); | ||
95 | } | ||
96 | } | 87 | } |
97 | 88 | ||
@@ -105,8 +96,8 @@ namespace OpieTooth { | |||
105 | } | 96 | } |
106 | 97 | ||
107 | int BluezApplet::position() | 98 | int BluezApplet::position() |
108 | { | 99 | { |
109 | return 6; | 100 | return 6; |
110 | } | 101 | } |
111 | 102 | ||
112 | 103 | ||
@@ -114,9 +105,12 @@ int BluezApplet::position() | |||
114 | if (btDevice) { | 105 | if (btDevice) { |
115 | if (btDevice->isLoaded() ) { | 106 | if (btDevice->isLoaded() ) { |
107 | odebug << "btDevice isLoaded" << oendl; | ||
116 | return true; | 108 | return true; |
117 | } else { | 109 | } else { |
110 | odebug << "btDevice is NOT loaded" << oendl; | ||
118 | return false; | 111 | return false; |
119 | } | 112 | } |
120 | } else { | 113 | } else { |
114 | odebug << "btDevice is ZERO" << oendl; | ||
121 | return false; | 115 | return false; |
122 | } | 116 | } |
@@ -125,5 +119,4 @@ int BluezApplet::position() | |||
125 | int BluezApplet::setBluezStatus(int c) { | 119 | int BluezApplet::setBluezStatus(int c) { |
126 | 120 | ||
127 | OProcess* btstart = new OProcess(); | ||
128 | if ( c == 1 ) { | 121 | if ( c == 1 ) { |
129 | switch ( ODevice::inst()->model() ) { | 122 | switch ( ODevice::inst()->model() ) { |
@@ -146,20 +139,11 @@ int BluezApplet::position() | |||
146 | break; | 139 | break; |
147 | } | 140 | } |
148 | *btstart << "/etc/init.d/bluetooth" << "start"; | 141 | QCopEnvelope e("QPE/System", "execute(QString)"); |
149 | btstart->setUseShell(true); | 142 | e << QString("/etc/init.d/bluetooth start"); |
150 | if (!btstart->start(OProcess::DontCare, OProcess::AllOutput)) | ||
151 | delete btstart; | ||
152 | else { | ||
153 | connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)), | ||
154 | this, SLOT(slotProcessExited(Opie::Core::OProcess*))); | ||
155 | } | ||
156 | } else { | 143 | } else { |
157 | *btstart << "/etc/init.d/bluetooth" << "stop"; | 144 | ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); |
158 | btstart->setUseShell(true); | 145 | if ( btManager ) { |
159 | if (!btstart->start(OProcess::DontCare, OProcess::AllOutput)) | 146 | delete btManager; |
160 | delete btstart; | 147 | btManager = 0; |
161 | else { | ||
162 | connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)), | ||
163 | this, SLOT(slotProcessExited(Opie::Core::OProcess*))); | ||
164 | } | 148 | } |
165 | if ( btDevice ) { | 149 | if ( btDevice ) { |
@@ -198,5 +182,5 @@ int BluezApplet::position() | |||
198 | setBluezStatus(0); | 182 | setBluezStatus(0); |
199 | doListDevice = false; | 183 | doListDevice = false; |
200 | } | 184 | } |
201 | else if ( str == "listDevices()") { | 185 | else if ( str == "listDevices()") { |
202 | if (checkBluezStatus()) { | 186 | if (checkBluezStatus()) { |
@@ -263,4 +247,5 @@ int BluezApplet::position() | |||
263 | QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); | 247 | QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); |
264 | ret = menu->exec(p, 0); | 248 | ret = menu->exec(p, 0); |
249 | menu->hide(); | ||
265 | 250 | ||
266 | switch(ret) { | 251 | switch(ret) { |
@@ -349,13 +334,4 @@ int BluezApplet::position() | |||
349 | } | 334 | } |
350 | } | 335 | } |
351 | |||
352 | /** | ||
353 | * Implementation of the process finish | ||
354 | * @param the finished process | ||
355 | */ | ||
356 | void BluezApplet::slotProcessExited(OProcess* proc) | ||
357 | { | ||
358 | delete proc; | ||
359 | } | ||
360 | }; | 336 | }; |
361 | 337 | ||
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h index 85022bb..90bee3b 100644 --- a/noncore/net/opietooth/applet/bluezapplet.h +++ b/noncore/net/opietooth/applet/bluezapplet.h | |||
@@ -74,6 +74,4 @@ public slots: | |||
74 | private slots: | 74 | private slots: |
75 | void slotMessage( const QCString& , const QByteArray& ); | 75 | void slotMessage( const QCString& , const QByteArray& ); |
76 | void slotProcessExited(Opie::Core::OProcess* proc); | ||
77 | |||
78 | }; | 76 | }; |
79 | }; | 77 | }; |