summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opiestumbler/opiestumbler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/opiestumbler/opiestumbler.cpp b/noncore/net/opiestumbler/opiestumbler.cpp
index 2f4f54b..3531162 100644
--- a/noncore/net/opiestumbler/opiestumbler.cpp
+++ b/noncore/net/opiestumbler/opiestumbler.cpp
@@ -241,99 +241,99 @@ void OpieStumbler::slotShowDetails()
241 241
242} 242}
243 243
244void OpieStumbler::slotLoadManufacturers() 244void OpieStumbler::slotLoadManufacturers()
245{ 245{
246 m_db = Opie::Net::OManufacturerDB::instance(); 246 m_db = Opie::Net::OManufacturerDB::instance();
247} 247}
248 248
249QString OpieStumbler::manufacturer( const QString &mac, bool extended ) 249QString OpieStumbler::manufacturer( const QString &mac, bool extended )
250{ 250{
251 QString retval; 251 QString retval;
252 if ( m_db ) 252 if ( m_db )
253 if ( extended ) 253 if ( extended )
254 retval = m_db->lookupExt(mac); 254 retval = m_db->lookupExt(mac);
255 else 255 else
256 retval = m_db->lookup(mac); 256 retval = m_db->lookup(mac);
257 257
258 if ( retval.isEmpty() ) 258 if ( retval.isEmpty() )
259 retval = tr("Unknown"); 259 retval = tr("Unknown");
260 260
261 return retval; 261 return retval;
262} 262}
263 263
264void OpieStumbler::slotJoinNetwork() 264void OpieStumbler::slotJoinNetwork()
265{ 265{
266 slotStopScanning(); 266 slotStopScanning();
267 267
268 OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); 268 OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface));
269 269
270 if( !wiface ) 270 if( !wiface )
271 return; 271 return;
272 272
273 QListIterator<StumblerStation> it(m_stationsHistory); 273 QListIterator<StumblerStation> it(m_stationsHistory);
274 274
275 for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it ); 275 for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it );
276 276
277 if( !it.current() ) 277 if( !it.current() )
278 return; 278 return;
279 279
280 m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1); 280 m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1);
281 m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize ); 281 m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize );
282 m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised ); 282 m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised );
283 m_splashBox = new QVBoxLayout( m_splash, 4, 4 ); 283 m_splashBox = new QVBoxLayout( m_splash, 4, 4 );
284 m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash ); 284 m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash );
285 m_pbar = new QProgressBar( 3, m_splash ); 285 m_pbar = new QProgressBar( 3, m_splash );
286 m_pbar->setCenterIndicator(true); 286 m_pbar->setCenterIndicator(true);
287 m_splashBox->addWidget( m_infoLabel ); 287 m_splashBox->addWidget( m_infoLabel );
288 m_splashBox->addWidget( m_pbar ); 288 m_splashBox->addWidget( m_pbar );
289 int sw = m_splashBox->sizeHint().width()*2; 289 int sw = m_splashBox->sizeHint().width() * 2;
290 int sh = m_splashBox->sizeHint().height(); 290 int sh = m_splashBox->sizeHint().height();
291 m_splash->setGeometry((240-(sw))/2, (320-sh)/2, sw, sh); 291 m_splash->setGeometry((qApp->desktop()->width() - sw)/2, (qApp->desktop()->height() - sh)/2, sw, sh);
292 m_splash->show(); 292 m_splash->show();
293 m_splash->raise(); 293 m_splash->raise();
294 294
295 Opie::Net::OStation *station = it.current()->st; 295 Opie::Net::OStation *station = it.current()->st;
296 296
297 odebug << "Bringing interface down" << oendl; 297 odebug << "Bringing interface down" << oendl;
298 wiface->setUp(false); 298 wiface->setUp(false);
299 299
300 odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl; 300 odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl;
301 wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" ); 301 wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" );
302 302
303 odebug << "Setting channel to " << station->channel << oendl; 303 odebug << "Setting channel to " << station->channel << oendl;
304 wiface->setChannel(station->channel); 304 wiface->setChannel(station->channel);
305 305
306 odebug << "Setting SSID to " << station->ssid << oendl; 306 odebug << "Setting SSID to " << station->ssid << oendl;
307 wiface->setSSID(station->ssid); 307 wiface->setSSID(station->ssid);
308 308
309 wiface->commit(); 309 wiface->commit();
310 310
311 odebug << "Bringing interface up" << oendl; 311 odebug << "Bringing interface up" << oendl;
312 wiface->setUp(true); 312 wiface->setUp(true);
313 m_pbar->setProgress(1); 313 m_pbar->setProgress(1);
314 //Wait 5 sec for association 314 //Wait 5 sec for association
315 QTimer::singleShot(5000, this, SLOT(slotAssociated())); 315 QTimer::singleShot(5000, this, SLOT(slotAssociated()));
316} 316}
317 317
318void OpieStumbler::slotAssociated() 318void OpieStumbler::slotAssociated()
319{ 319{
320 OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); 320 OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface));
321 321
322 if( !wiface ) { 322 if( !wiface ) {
323 slotCleanSplash(); 323 slotCleanSplash();
324 return; 324 return;
325 } 325 }
326 326
327 if (!wiface->isAssociated()) { 327 if (!wiface->isAssociated()) {
328 Global::statusMessage(tr("Could not Join")); 328 Global::statusMessage(tr("Could not Join"));
329 m_infoLabel->setText(tr("Could not Join")); 329 m_infoLabel->setText(tr("Could not Join"));
330 QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); 330 QTimer::singleShot(5000, this, SLOT(slotCleanSplash()));
331 return; 331 return;
332 } 332 }
333 333
334 Global::statusMessage(tr("Joined")); 334 Global::statusMessage(tr("Joined"));
335 m_pbar->setProgress(2); 335 m_pbar->setProgress(2);
336 m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid)); 336 m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid));
337 337
338 if(m_proc) { 338 if(m_proc) {
339 m_proc->kill(); 339 m_proc->kill();