[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid/backends/hal
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-11-06 10:00:00
Message-ID: 1225965600.671472.16964.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 880718 by mkretz:

nowadays HAL has the info.subsystem key with the value sound, which we \
don't care about we want to know whether it's USB or PCI or whatever, so \
when we see sound as subsystem we look at the grandparent

 M  +2 -1      halaudiointerface.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/hal/halaudiointerface.cpp \
#880717:880718 @@ -166,7 +166,8 @@
     if (!parentUdi.isEmpty()) {
         QDBusInterface parentIface(QLatin1String("org.freedesktop.Hal"), \
m_device->parentUdi(), "org.freedesktop.Hal.Device", \
                QDBusConnection::systemBus());
         const QDBusMessage &reply = parentIface.call("GetProperty", \
                QLatin1String("info.subsystem"));
-        if (reply.type() != QDBusMessage::ReplyMessage && \
reply.errorName() == "org.freedesktop.Hal.NoSuchProperty") { +        if \
((reply.type() != QDBusMessage::ReplyMessage && reply.errorName() == \
"org.freedesktop.Hal.NoSuchProperty") || +                (reply.type() == \
                QDBusMessage::ReplyMessage && reply.arguments().at(0) == \
                "sound")) {
             const QDBusMessage &reply2 = parentIface.call("GetProperty", \
QLatin1String("info.parent"));  if (reply2.type() == \
QDBusMessage::ReplyMessage) {  parentUdi = \
reply2.arguments().at(0).toString();


[prev in list] [next in list] [prev in thread] [next in thread]