440 } |
440 } |
441 |
441 |
442 void QSystemNetworkInfoPrivate::setupNetworkInfo() |
442 void QSystemNetworkInfoPrivate::setupNetworkInfo() |
443 { |
443 { |
444 currentCellNetworkStatus = QSystemNetworkInfo::UndefinedStatus; |
444 currentCellNetworkStatus = QSystemNetworkInfo::UndefinedStatus; |
|
445 currentBluetoothNetworkStatus = networkStatus(QSystemNetworkInfo::BluetoothMode); |
445 currentEthernetState = "down"; |
446 currentEthernetState = "down"; |
446 currentEthernetSignalStrength = networkSignalStrength(QSystemNetworkInfo::EthernetMode); |
447 currentEthernetSignalStrength = networkSignalStrength(QSystemNetworkInfo::EthernetMode); |
447 currentWlanSignalStrength = networkSignalStrength(QSystemNetworkInfo::WlanMode); |
448 currentWlanSignalStrength = networkSignalStrength(QSystemNetworkInfo::WlanMode); |
448 currentLac = -1; |
449 currentLac = -1; |
449 currentCellId = -1; |
450 currentCellId = -1; |
561 "/com/nokia/bme/signal", |
562 "/com/nokia/bme/signal", |
562 "com.nokia.bme.signal", |
563 "com.nokia.bme.signal", |
563 QLatin1String("charger_disconnected"), |
564 QLatin1String("charger_disconnected"), |
564 this, SLOT(usbCableAction())) ) { |
565 this, SLOT(usbCableAction())) ) { |
565 qWarning() << "unable to connect to usbCableAction (disconnect)"; |
566 qWarning() << "unable to connect to usbCableAction (disconnect)"; |
|
567 } |
|
568 if(!systemDbusConnection.connect("org.freedesktop.Hal", |
|
569 "/org/freedesktop/Hal/Manager", |
|
570 "org.freedesktop.Hal.Manager", |
|
571 QLatin1String("DeviceAdded"), |
|
572 this, SLOT(bluetoothNetworkStatusCheck())) ) { |
|
573 qWarning() << "unable to connect to bluetoothNetworkStatusCheck (1)"; |
|
574 } |
|
575 if(!systemDbusConnection.connect("org.freedesktop.Hal", |
|
576 "/org/freedesktop/Hal/Manager", |
|
577 "org.freedesktop.Hal.Manager", |
|
578 QLatin1String("DeviceRemoved"), |
|
579 this, SLOT(bluetoothNetworkStatusCheck())) ) { |
|
580 qWarning() << "unable to connect to bluetoothNetworkStatusCheck (2)"; |
566 } |
581 } |
567 #endif |
582 #endif |
568 } |
583 } |
569 |
584 |
570 void QSystemNetworkInfoPrivate::cellNetworkSignalStrengthChanged(uchar var1, uchar) |
585 void QSystemNetworkInfoPrivate::cellNetworkSignalStrengthChanged(uchar var1, uchar) |
687 if (currentWlanSignalStrength != networkSignalStrength(QSystemNetworkInfo::WlanMode)) { |
702 if (currentWlanSignalStrength != networkSignalStrength(QSystemNetworkInfo::WlanMode)) { |
688 currentWlanSignalStrength = networkSignalStrength(QSystemNetworkInfo::WlanMode); |
703 currentWlanSignalStrength = networkSignalStrength(QSystemNetworkInfo::WlanMode); |
689 emit networkSignalStrengthChanged(QSystemNetworkInfo::WlanMode, currentWlanSignalStrength); |
704 emit networkSignalStrengthChanged(QSystemNetworkInfo::WlanMode, currentWlanSignalStrength); |
690 } |
705 } |
691 } |
706 } |
|
707 |
|
708 void QSystemNetworkInfoPrivate::bluetoothNetworkStatusCheck() |
|
709 { |
|
710 if (currentBluetoothNetworkStatus != networkStatus(QSystemNetworkInfo::BluetoothMode)) { |
|
711 currentBluetoothNetworkStatus = networkStatus(QSystemNetworkInfo::BluetoothMode); |
|
712 emit networkStatusChanged(QSystemNetworkInfo::BluetoothMode, currentBluetoothNetworkStatus); |
|
713 } |
|
714 } |
|
715 |
692 |
716 |
693 void QSystemNetworkInfoPrivate::setWlanSignalStrengthCheckEnabled(bool enabled) |
717 void QSystemNetworkInfoPrivate::setWlanSignalStrengthCheckEnabled(bool enabled) |
694 { |
718 { |
695 if (enabled) { |
719 if (enabled) { |
696 iWlanStrengthCheckEnabled++; |
720 iWlanStrengthCheckEnabled++; |