From kde-commits Wed Nov 10 10:22:39 2010 From: Pino Toscano Date: Wed, 10 Nov 2010 10:22:39 +0000 To: kde-commits Subject: KDE/kdelibs/solid/solid/backends/hal Message-Id: <20101110102239.DA9A7AC89E () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128938459529669 SVN commit 1195085 by pino: fix reporting the vendor for batteries battery.vendor should be used for them, leaving info.vendor otherwise M +6 -0 haldevice.cpp --- trunk/KDE/kdelibs/solid/solid/backends/hal/haldevice.cpp #1195084:1195085 @@ -172,8 +172,14 @@ QString HalDevice::vendor() const { + const QString category = property("info.category").toString(); + + if (category == QLatin1String("battery")) { + return property("battery.vendor").toString(); + } else { return property("info.vendor").toString(); } +} QString HalDevice::product() const {