← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdebase-workspace/oneiric

« back to all changes in this revision

Viewing changes to powerdevil/kcmodule/global/GeneralPage.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Christian Mangold
  • Date: 2011-04-03 16:54:55 UTC
  • mfrom: (1.1.55 upstream)
  • Revision ID: james.westby@ubuntu.com-20110403165455-8tnwxt82p21p15hh
Tags: 4:4.6.2a-0ubuntu1
* New upstream release
  - Update kde-sc-dev-latest version
  - Update kdebase-workspace-wallpapers.install,
    kde-window-manager.install and not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
powerdevil/kcmodule/global/GeneralPage.cpp
82
82
 
83
83
    foreach(const Solid::Device &device, Solid::Device::listFromType(Solid::DeviceInterface::Battery, QString())) {
84
84
        const Solid::Battery *b = qobject_cast<const Solid::Battery*> (device.asDeviceInterface(Solid::DeviceInterface::Battery));
85
 
        if(b->type() != Solid::Battery::PrimaryBattery) {
 
85
        if(b->type() != Solid::Battery::PrimaryBattery && b->type() != Solid::Battery::UpsBattery) {
86
86
            continue;
87
87
        }
88
88
        ++batteryCount;