Moved large patch to mirrors.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 12 insertions, 1218 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index e6b21427a43e..53329f5811e4 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.17 2009/01/27 21:36:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.18 2009/01/28 12:47:47 jmbsvicetto Exp $
+
+  28 Jan 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -files/solid-4.2.0-backport-solid-bluetooth.patch, solid-4.2.0.ebuild:
+  Moved large patch to mirrors.
 
   27 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org>
   +files/solid-4.2.0-backport-solid-bluetooth.patch:
diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index 37fe71fb1d02..ab856c69dfd8 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -1,7 +1,7 @@
-AUX solid-4.2.0-backport-solid-bluetooth.patch 42383 RMD160 1aa238d89288ecc7f9bf00dfb532f216ea945bbb SHA1 c455e31c498f21e07a206fe28d10bf5e6acc726a SHA256 e3eeee966f4ca5c074a5cc187ee850dab4c999c3fd5deeffb194a1dd352072d4
 DIST kdebase-workspace-4.1.4.tar.bz2 47504097 RMD160 06a3208d5fd2d7df34f46f48b4a82ffe05af61af SHA1 3c6013f3178e89524da5a1a9e15d306304c0b29a SHA256 5f0a63ab3d97c9240ff78c4219572fa82ebe803a1f7ce5786ba44cca50c28e08
 DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
+DIST solid-4.2.0-backport-solid-bluetooth.patch.tar.bz2 6456 RMD160 34d2606be25950c96755fd7019c97f57fe3fa87c SHA1 90cc2b19c34bfa49406e6d71bd4915492f79ea83 SHA256 84008e1367fbf149fd1b32005caab936260e933acefa11498996e9527421df69
 EBUILD solid-4.1.4.ebuild 909 RMD160 0a748741b67c2162b829ea5eedb0b4a5f2c615f9 SHA1 3ef97450c875811db38bdc5eb69580057c6ffcf6 SHA256 47641b07ed23c080e20af8c7b2feeb472e60fe14d57abb21f137b9cdc0c0d7d4
-EBUILD solid-4.2.0.ebuild 1178 RMD160 1fee4481aedb4ac400dfe89fa745c7d2f7564132 SHA1 fea18c2d687db186809611304275625e74d88e00 SHA256 f9f11b16fa5ff4cbf34d7034ededdead8d9b36759cfcbf7039ebadeba4b82f14
-MISC ChangeLog 2530 RMD160 7a845caebef312527a17873f875cf6f261af8c36 SHA1 1eeda7ef6621834dd224c96292fdc2fc5a3a39ee SHA256 b2250ca3180e1fa34ffc6467e61c2eab13aca5080928e4d60c8feb634dcffd68
+EBUILD solid-4.2.0.ebuild 1279 RMD160 67393e22ec6a7bbfd0181113417939e50352fb6b SHA1 87b469a4394d4083e1840e6f5162b0ede5a2088b SHA256 8a506311712508aea4ae9d3861331b6afcfbc2a662f31dd96bb22736bce16bd4
+MISC ChangeLog 2708 RMD160 dc764047d686fc363d3cadc163752ca97176af63 SHA1 a00e79364ea5dd842b46ac99c58cc048415e85ed SHA256 48109b6753729d92577ce957e5f43b0d7a8ae9d00efb010a05525dc9e422c513
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/solid/files/solid-4.2.0-backport-solid-bluetooth.patch b/kde-base/solid/files/solid-4.2.0-backport-solid-bluetooth.patch
deleted file mode 100644
index fc4e3a42c7ca..000000000000
--- a/kde-base/solid/files/solid-4.2.0-backport-solid-bluetooth.patch
+++ /dev/null
@@ -1,1212 +0,0 @@
-Index: bluez-bluetoothinterface.cpp
-===================================================================
---- bluez-bluetoothinterface.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
-+++ solid/bluez/bluez-bluetoothinterface.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
-@@ -25,6 +25,7 @@
- #include <solid/control/bluetoothinterface.h>
- 
- #include "bluez-bluetoothremotedevice.h"
-+#include "bluez-bluetoothinputdevice.h"
- #include <KDebug>
- 
- 
-@@ -43,6 +44,7 @@
-     QString objectPath;
- 
-     QMap<QString, BluezBluetoothRemoteDevice *> devices;
-+    QMap<QString, BluezBluetoothInputDevice *> inputDevices;
- };
- 
- 
-@@ -56,23 +58,6 @@
-                                    objectPath, \
-                                    "org.bluez.Adapter", \
-                                    signal, this, SLOT(slot));
--/*  
--    connectInterfaceToThis("ModeChanged", slotModeChanged(const QString &));
--    connectInterfaceToThis("DiscoverableTimeoutChanged", slotDiscoverableTimeoutChanged(int));
--    connectInterfaceToThis("MinorClassChanged", slotMinorClassChanged(const QString &));
--    connectInterfaceToThis("NameChanged", slotNameChanged(const QString &));
--    connectInterfaceToThis("DiscoveryStarted", slotDiscoveryStarted());
--    connectInterfaceToThis("DiscoveryCompleted", slotDiscoveryCompleted());
--    connectInterfaceToThis("RemoteDeviceDisappeared", slotRemoteDeviceDisappeared(const QString &));
--    connectInterfaceToThis("RemoteDeviceFound", slotRemoteDeviceFound(const QString &, uint, short));
--    connectInterfaceToThis("RemoteNameUpdated", slotRemoteNameUpdated(const QString &, const QString &));
--    connectInterfaceToThis("RemoteDeviceConnected", slotRemoteDeviceConnected(const QString &));
--    connectInterfaceToThis("RemoteDeviceDisconnected", slotRemoteDeviceDisconnected(const QString &));
--    connectInterfaceToThis("TrustAdded", slotTrustAdded(const QString &));
--    connectInterfaceToThis("TrustRemoved", slotTrustRemoved(const QString &));
--    connectInterfaceToThis("BondingCreated", slotBondingCreated(const QString &));
--    connectInterfaceToThis("BondingRemoved", slotBondingRemoved(const QString &));
--*/
- 
-     connectInterfaceToThis("PropertyChanged", slotPropertyChanged(const QString &, const QVariant &));
-     connectInterfaceToThis("DeviceCreated", slotDeviceCreated(const QDBusObjectPath &));
-@@ -98,21 +83,14 @@
-     d->iface.call("CancelDeviceCreation",addr);
- }
- 
--QString BluezBluetoothInterface::createDevice(const QString &addr) const
-+void BluezBluetoothInterface::createDevice(const QString &addr) const
- {
--    QDBusObjectPath path = objectReply("CreateDevice",addr);
--    return path.path();
-+    d->iface.call("CreateDevice",addr);
- }
- 
--QString BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
-+void BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
- {
--    QDBusReply< QDBusObjectPath > reply;
--    reply = d->iface.call("CreatePairedDevice",addr,agentUBI,capab);
--
--    if (!reply.isValid()) {
--        return QString();
--    }
--    return reply.value().path();
-+    d->iface.call("CreatePairedDevice",addr,qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
- }
- 
- QString BluezBluetoothInterface::findDevice(const QString &addr) const
-@@ -147,7 +125,7 @@
- 
- void BluezBluetoothInterface::registerAgent(const QString &agentUBI, const QString &capab)
- {
--    d->iface.call("RegisterAgent",agentUBI,capab);
-+    d->iface.call("RegisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
- }
- 
- void BluezBluetoothInterface::releaseSession()
-@@ -157,7 +135,7 @@
- 
- void BluezBluetoothInterface::removeDevice(const QString &deviceUBI )
- {
--    d->iface.call("RemoveDevice",deviceUBI);
-+    d->iface.call("RemoveDevice",qVariantFromValue(QDBusObjectPath(deviceUBI)));
- }
- 
- void BluezBluetoothInterface::requestSession()
-@@ -183,305 +161,20 @@
- 
- void BluezBluetoothInterface::unregisterAgent(const QString &agentUBI)
- {
--    d->iface.call("UnregisterAgent",agentUBI);
-+    d->iface.call("UnregisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)));
- }
- 
- 
- 
--/*
--
--QString BluezBluetoothInterface::address() const
-+void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
- {
--    return stringReply("GetAddress");
--}
-+    kDebug() << "device created";
- 
--QString BluezBluetoothInterface::version() const
--{
--    return stringReply("GetVersion");
--}
--
--QString BluezBluetoothInterface::revision() const
--{
--    return stringReply("GetRevision");
--}
--
--QString BluezBluetoothInterface::manufacturer() const
--{
--    return stringReply("GetManufacturer");
--}
--
--QString BluezBluetoothInterface::company() const
--{
--    return stringReply("GetCompany");
--}
--
--Solid::Control::BluetoothInterface::Mode BluezBluetoothInterface::mode() const
--{
--    QString theMode = stringReply("GetMode");
--    Solid::Control::BluetoothInterface::Mode modeEnum;
--    if (theMode == "connectable")
--    {
--        modeEnum = Solid::Control::BluetoothInterface::Connectable;
-+    if (!d->devices.contains(path.path())) {
-+        BluezBluetoothRemoteDevice* bluetoothRemoteDev = new BluezBluetoothRemoteDevice(path.path());
-+        d->devices.insert(path.path(), bluetoothRemoteDev);
-     }
--    else if (theMode == "discoverable")
--    {
--        modeEnum = Solid::Control::BluetoothInterface::Discoverable;
--    } else {
--        Q_ASSERT(theMode == "off");
--        modeEnum = Solid::Control::BluetoothInterface::Off;
--    }
--    return modeEnum;
--}
- 
--int BluezBluetoothInterface::discoverableTimeout() const
--{
--    QDBusReply< uint > timeout = d->iface.call("GetDiscoverableTimeout");
--    if (timeout.isValid()) {
--        return timeout.value();
--    }
--
--    return -1;
--}
--
--bool BluezBluetoothInterface::isDiscoverable() const
--{
--    return boolReply("IsDiscoverable");
--}
--
--QStringList BluezBluetoothInterface::listConnections() const
--{
--    QStringList list = listReply("ListConnections");
--    for (int i = 0; i < list.size(); i++) {
--        list[i] = ubi() + '/' + list[i];
--    }
--    return list;
--}
--
--QString BluezBluetoothInterface::majorClass() const
--{
--    return stringReply("GetMajorClass");
--}
--
--QStringList BluezBluetoothInterface::listAvailableMinorClasses() const
--{
--    return listReply("ListAvailableMinorClasses");
--}
--
--QString BluezBluetoothInterface::minorClass() const
--{
--    return stringReply("GetMinorClass");
--}
--
--QStringList BluezBluetoothInterface::serviceClasses() const
--{
--    return listReply("GetServiceClasses");
--}
--
--QString BluezBluetoothInterface::name() const
--{
--    return stringReply("GetName");
--}
--
--QString BluezBluetoothInterface::getRemoteName(const QString &mac)
--{
--    return stringReply("GetRemoteName",mac);
--}
--
--bool BluezBluetoothInterface::isTrusted(const QString &mac)
--{
--   return boolReply("IsTrusted",mac);
--}
--
--QStringList BluezBluetoothInterface::listBondings() const
--{
--    return listReply("ListBondings");
--}
--
--bool BluezBluetoothInterface::isPeriodicDiscoveryActive() const
--{
--    return boolReply("IsPeriodicDiscovery");
--}
--
--bool BluezBluetoothInterface::isPeriodicDiscoveryNameResolvingActive() const
--{
--    return boolReply("IsPeriodicDiscoveryNameResolving");
--}
--
--QStringList BluezBluetoothInterface::listRemoteDevices() const
--{
--    QStringList list = listReply("ListRemoteDevices");
--    for (int i = 0; i < list.size(); i++) {
--        list[i] = ubi() + '/' + list[i];
--    }
--    return list;
--}
--
--QStringList BluezBluetoothInterface::listRecentRemoteDevices(const QDateTime &) const
--{
--    return listReply("ListRecentRemoteDevices");
--}
--
--void BluezBluetoothInterface::setMode(const Solid::Control::BluetoothInterface::Mode mode)
--{
--    QString modeString;
--    switch(mode)
--    {
--    case Solid::Control::BluetoothInterface::Off:
--        modeString = "off";
--        break;
--    case Solid::Control::BluetoothInterface::Discoverable:
--        modeString = "discoverable";
--        break;
--    case Solid::Control::BluetoothInterface::Connectable:
--        modeString = "connectable";
--        break;
--    }
--    d->iface.call("SetMode", modeString);
--}
--
--void BluezBluetoothInterface::setDiscoverableTimeout(int timeout)
--{
--    d->iface.call("SetDiscoverableTimeout", (uint)timeout);
--}
--
--void BluezBluetoothInterface::setMinorClass(const QString &minorClass)
--{
--    d->iface.call("SetMinorClass", minorClass);
--}
--
--void BluezBluetoothInterface::setName(const QString &name)
--{
--    d->iface.call("SetName", name);
--}
--
--void BluezBluetoothInterface::discoverDevices()
--{
--    d->iface.call("DiscoverDevices");
--}
--
--void BluezBluetoothInterface::discoverDevicesWithoutNameResolving()
--{
--    d->iface.call("DiscoverDevicesWithoutNameResolving");
--}
--
--void BluezBluetoothInterface::cancelDiscovery()
--{
--    d->iface.call("CancelDiscovery");
--}
--
--void BluezBluetoothInterface::startPeriodicDiscovery()
--{
--    d->iface.call("StartPeriodicDiscovery");
--}
--
--void BluezBluetoothInterface::stopPeriodicDiscovery()
--{
--    d->iface.call("StopPeriodicDiscovery");
--}
--
--void BluezBluetoothInterface::setPeriodicDiscoveryNameResolving(bool nameResolving)
--{
--    d->iface.call("SetPeriodicDiscoveryNameResolving", nameResolving);
--}
--
--void BluezBluetoothInterface::setTrusted(const QString& mac)
--{
--    d->iface.call("SetTrusted", mac);
--}
--
--void BluezBluetoothInterface::removeTrust(const QString& mac)
--{
--    d->iface.call("RemoveTrust", mac);
--}
--
--*/
--
--
--
--/*
--
--void BluezBluetoothInterface::slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode)
--{
--    emit modeChanged(mode);
--}
--
--void BluezBluetoothInterface::slotDiscoverableTimeoutChanged(int timeout)
--{
--    emit discoverableTimeoutChanged(timeout);
--}
--
--void BluezBluetoothInterface::slotMinorClassChanged(const QString &minorClass)
--{
--    emit minorClassChanged(minorClass);
--}
--
--void BluezBluetoothInterface::slotNameChanged(const QString &name)
--{
--    emit nameChanged(name);
--}
--
--void BluezBluetoothInterface::slotDiscoveryStarted()
--{
--    emit discoveryStarted();
--}
--
--void BluezBluetoothInterface::slotDiscoveryCompleted()
--{
--    emit discoveryCompleted();
--}
--
--void BluezBluetoothInterface::slotRemoteDeviceFound(const QString &address, uint deviceClass, short rssi)
--{
--    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
--    emit remoteDeviceFound(remoteubi, deviceClass, rssi);
--}
--
--void BluezBluetoothInterface::slotRemoteDeviceDisappeared(const QString &address)
--{
--    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
--    emit remoteDeviceDisappeared(remoteubi);
--}
--
--void BluezBluetoothInterface::slotRemoteNameUpdated(const QString &address, const QString& name)
--{
--   emit remoteNameUpdated(address,name);
--}
--
--void BluezBluetoothInterface::slotRemoteDeviceConnected(const QString &address)
--{
--   emit remoteDeviceConnected(address);
--}
--
--void BluezBluetoothInterface::slotRemoteDeviceDisconnected(const QString &address)
--{
--   emit remoteDeviceDisconnected(address);
--}
--
--void BluezBluetoothInterface::slotTrustAdded(const QString &address)
--{
--   emit trustAdded(address);
--}
--
--void BluezBluetoothInterface::slotTrustRemoved(const QString &address)
--{
--   emit trustRemoved(address);
--}
--
--void BluezBluetoothInterface::slotBondingCreated(const QString &address)
--{
--   emit bondingCreated(address);
--}
--
--void BluezBluetoothInterface::slotBondingRemoved(const QString &address)
--{
--   emit bondingRemoved(address);
--}
--
--*/
--
--void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
--{
--    kDebug() << "device created";
-     emit deviceCreated(path.path());
- }
- 
-@@ -523,7 +216,20 @@
-     return bluetoothInterface;
- }
- 
-+QObject *BluezBluetoothInterface::createBluetoothInputDevice(const QString &ubi)
-+{
-+    BluezBluetoothInputDevice *bluetoothInputDev;
-+    if (d->inputDevices.contains(ubi)) {
-+        bluetoothInputDev = d->inputDevices[ubi];
-+    } else {
-+        bluetoothInputDev = new BluezBluetoothInputDevice(ubi);
-+        d->inputDevices.insert(ubi, bluetoothInputDev);
-+    }
-+    return bluetoothInputDev;
-+}
- 
-+
-+
- /******************* DBus Calls *******************************/
- 
- QStringList BluezBluetoothInterface::listReply(const QString &method) const
-@@ -574,10 +280,13 @@
- 
-     if (param.isEmpty())
- 	    reply = d->iface.call(method);
--    else
-+    else {
-+            qDebug() << "ObjectReply calling: " << method << " " << param;
- 	    reply = d->iface.call(method, param);
-+    }
- 	    	
-     if (reply.isValid()) {
-+        qDebug() << "ObjectReply Valid? "<<  reply.value().path();
-         return reply.value();
-     }
- 
-Index: bluez-bluetoothinterface.h
-===================================================================
---- bluez-bluetoothinterface.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
-+++ solid/bluez/bluez-bluetoothinterface.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
-@@ -27,6 +27,7 @@
- #include <QtDBus>
- #include <QDBusVariant>
- #include <QDBusObjectPath>
-+#include <QString>
- 
- #include <solid/control/ifaces/bluetoothinterface.h>
- 
-@@ -42,34 +43,11 @@
-     BluezBluetoothInterface(const QString  & objectPath);
-     virtual ~BluezBluetoothInterface();
-     QString ubi() const;
--/*
--    QString address() const;
--    QString version() const;
--    QString revision() const;
--    QString manufacturer() const;
--    QString company() const;
--    Solid::Control::BluetoothInterface::Mode mode() const;
--    int discoverableTimeout() const;
--    bool isDiscoverable() const;
--    QStringList listConnections() const;
--    QString majorClass() const;
--    QStringList listAvailableMinorClasses() const;
--    QString minorClass() const;
--    QStringList serviceClasses() const;
--    QString name() const;
--    QStringList listBondings() const;
--    bool isPeriodicDiscoveryActive() const;
--    bool isPeriodicDiscoveryNameResolvingActive() const;
--    QStringList listRemoteDevices() const;
--    QStringList listRecentRemoteDevices(const QDateTime &) const;
--    QString getRemoteName(const QString &);
--    bool isTrusted(const QString &);
--
--*/    
-+    
-     QObject *createBluetoothRemoteDevice(const QString &);
--
--    QString createDevice(const QString &) const;
--    QString createPairedDevice(const QString &,const QString &,const QString &) const;
-+    QObject *createBluetoothInputDevice(const QString &);
-+    void createDevice(const QString &) const;
-+    void createPairedDevice(const QString &,const QString &,const QString &) const;
-     QString findDevice(const QString &) const;
-     QMap< QString, QVariant > getProperties() const;
-     QStringList listDevices() const;
-@@ -87,36 +65,6 @@
-     void stopDiscovery();
-     void unregisterAgent(const QString &);
- 
--/*
--    void setMode(const Solid::Control::BluetoothInterface::Mode);
--    void setDiscoverableTimeout(int);
--    void setMinorClass(const QString &);
--    void setName(const QString &);
--    void discoverDevices();
--    void discoverDevicesWithoutNameResolving();
--    void cancelDiscovery();
--    void startPeriodicDiscovery();
--    void stopPeriodicDiscovery();
--    void setPeriodicDiscoveryNameResolving(bool);
--    void setTrusted(const QString &);
--    void removeTrust(const QString &);
--
--    void slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode);
--    void slotDiscoverableTimeoutChanged(int timeout);
--    void slotMinorClassChanged(const QString &minor);
--    void slotNameChanged(const QString &name);
--    void slotDiscoveryStarted();
--    void slotDiscoveryCompleted();
--    void slotRemoteDeviceFound(const QString &ubi, uint deviceClass, short rssi);
--    void slotRemoteDeviceDisappeared(const QString &ubi);
--    void slotRemoteNameUpdated(const QString &, const QString &);
--    void slotRemoteDeviceConnected(const QString&);
--    void slotRemoteDeviceDisconnected(const QString&);
--    void slotTrustAdded(const QString&);
--    void slotTrustRemoved(const QString&);
--    void slotBondingCreated(const QString&);
--    void slotBondingRemoved(const QString&);
--*/    
-     void slotDeviceCreated(const QDBusObjectPath &);
-     void slotDeviceDisappeared(const QString &);
-     void slotDeviceFound(const QString &, const QMap< QString, QVariant > &);
-Index: bluez-bluetoothmanager.cpp
-===================================================================
---- bluez-bluetoothmanager.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
-+++ solid/bluez/bluez-bluetoothmanager.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
-@@ -104,6 +104,7 @@
- 
- QString BluezBluetoothManager::defaultInterface() const
- {
-+    kDebug() << "Calling Backend Default Interface";
-     QDBusReply< QDBusObjectPath > path = d->manager.call("DefaultAdapter");
-     if (!path.isValid())
-         return QString();
-@@ -132,6 +133,16 @@
-     return bluetoothInterface;
- }
- 
-+void BluezBluetoothManager::removeInterface(const QString& ubi)
-+{
-+
-+    if (d->interfaces.contains(ubi)) {
-+        kDebug() << "Removing Interface" << ubi;
-+        BluezBluetoothInterface * bluetoothInterface = d->interfaces.take(ubi);
-+        bluetoothInterface = 0;
-+    }
-+}
-+
- /*
- KJob *BluezBluetoothManager::setupInputDevice(const QString &ubi)
- {
-Index: bluez-bluetoothremotedevice.cpp
-===================================================================
---- bluez-bluetoothremotedevice.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
-+++ solid/bluez/bluez-bluetoothremotedevice.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
-@@ -42,6 +42,7 @@
- 	m_adapter = m_objectPath.left(objectPath.size() - 18);
- 	m_address = m_objectPath.right(17);
- 
-+        kdDebug() << "Connecting to ObjectPath: " << objectPath;
- 
- 	device = new QDBusInterface("org.bluez", objectPath,
- 				    "org.bluez.Device", QDBusConnection::systemBus());
-@@ -79,7 +80,7 @@
- 
- void BluezBluetoothRemoteDevice::setProperty(const QString &name, const QVariant &value)
- {
--    device->call("SetProperty",name,value);
-+    device->call("SetProperty",name,qVariantFromValue(QDBusVariant(value)));
- }
- 
- void BluezBluetoothRemoteDevice::discoverServices(const QString& pattern) const
-Index: bluez-bluetoothmanager.h
-===================================================================
---- bluez-bluetoothmanager.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
-+++ solid/bluez/bluez-bluetoothmanager.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
-@@ -43,6 +43,7 @@
-     virtual ~BluezBluetoothManager();
-     QStringList bluetoothInterfaces() const;
-     QObject * createInterface(const QString &);
-+    void removeInterface(const QString& ubi);
- //  QStringList bluetoothInputDevices() const;
-     QString defaultInterface() const;
-     QString findInterface(const QString &) const;
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinputdevice.cpp kdebase/workspace/libs/solid/control/bluetoothinputdevice.cpp
---- 4_2libsControl/bluetoothinputdevice.cpp	2009-01-17 17:51:33.000000000 +0100
-+++ libs/solid/control/bluetoothinputdevice.cpp	2009-01-14 21:06:47.000000000 +0100
-@@ -91,8 +91,8 @@
-     FrontendObjectPrivate::setBackendObject(object);
- 
-     if (object) {
--        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
--                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
-+        QObject::connect(object, SIGNAL(propertyChanged(const QString&,const QVariant&)),
-+                         parent(), SIGNAL(propertyChanged(const QString,const QVariant&)));
-     }
- }
- 
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.cpp kdebase/workspace/libs/solid/control/bluetoothinterface.cpp
---- 4_2libsControl/bluetoothinterface.cpp	2009-01-17 17:51:33.000000000 +0100
-+++ libs/solid/control/bluetoothinterface.cpp	2009-01-16 12:11:03.000000000 +0100
-@@ -25,7 +25,7 @@
- #include <QStringList>
- #include <QVariant>
- 
--#include <kdebug.h>
-+#include <KDebug>
- 
- #include "ifaces/bluetoothinterface.h"
- 
-@@ -49,9 +49,12 @@
-     void setBackendObject(QObject *object);
- 
-     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> findRegisteredBluetoothRemoteDevice(const QString &ubi) const;
-+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> findRegisteredBluetoothInputDevice(const QString &ubi) const;
- 
-     mutable QMap<QString, QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> > remoteDeviceMap;
-+    mutable QMap<QString, QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> > inputDeviceMap;
-     mutable BluetoothRemoteDevice invalidDevice;
-+    mutable BluetoothInputDevice invalidInputDevice;
- };
- }
- }
-@@ -65,30 +68,39 @@
- {
-     const BluetoothInterface &device = BluetoothManager::self().findBluetoothInterface(ubi);
-     d->setBackendObject(device.d->backendObject());
-+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
- }
- 
- Solid::Control::BluetoothInterface::BluetoothInterface(QObject *backendObject)
-         : QObject(), d(new BluetoothInterfacePrivate(this))
- {
-     d->setBackendObject(backendObject);
-+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
- }
- 
- Solid::Control::BluetoothInterface::BluetoothInterface(const BluetoothInterface &device)
-         : QObject(), d(new BluetoothInterfacePrivate(this))
- {
-     d->setBackendObject(device.d->backendObject());
-+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
- }
- 
- Solid::Control::BluetoothInterface::~BluetoothInterface()
- {
-     // Delete all the interfaces, they are now outdated
-     typedef QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> BluetoothRemoteDeviceIfacePair;
-+    typedef QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> BluetoothInputDeviceIfacePair;
- 
-     // Delete all the devices, they are now outdated
--    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap) {
-+    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap.values()) {
-         delete pair.first;
-         delete pair.second;
-     }
-+    foreach (const BluetoothInputDeviceIfacePair &pair, d->inputDeviceMap.values()) {
-+        delete pair.first;
-+        delete pair.second;
-+    }
-+
- }
- 
- Solid::Control::BluetoothInterface &Solid::Control::BluetoothInterface::operator=(const Solid::Control::BluetoothInterface  & dev)
-@@ -108,9 +120,12 @@
-     SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), cancelDeviceCreation(address));
- }
- 
--QString Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
-+void Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
- {
--    return_SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), QString(), createPairedDevice(address,adapterPath,capab));
-+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
-+    if (backend == 0) 
-+        return;
-+    backend->createPairedDevice(address,adapterPath,capab);
- }
- 
- QMap<QString, QVariant> Solid::Control::BluetoothInterface::getProperties() const
-@@ -137,7 +152,7 @@
- 
-     Solid::Control::BluetoothRemoteDeviceList list;
-     foreach (const QString& ubi,ubis) {
--        BluetoothRemoteDevice remoteDevice = findBluetoothRemoteDevice(ubi);
-+        BluetoothRemoteDevice* remoteDevice = findBluetoothRemoteDeviceUBI(ubi);
-         list.append(remoteDevice);
-     }
-     return list;
-@@ -184,13 +199,13 @@
- }
- 
- 
--Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDevice(const QString &address) const
-+Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceAddr(const QString &address) const
- {
-     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
-     if (backend == 0) 
-         return d->invalidDevice;
- 
--    const QString ubi = backend->findDevice(address);
-+    const QString ubi = getBluetoothRemoteDeviceUBI(address);
- 
-     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
- 
-@@ -201,18 +216,56 @@
-     }
- }
- 
--Solid::Control::BluetoothRemoteDevice * Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
-+
-+const QString Solid::Control::BluetoothInterface::getBluetoothRemoteDeviceUBI(const QString &address) const
- {
-     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
-     if (backend == 0) 
--        return 0;
-+        return "";
-+
-+    const QString ubi = backend->findDevice(address);
-+    return ubi;
-+}
- 
--    const QString ubi = backend->createDevice(address);
- 
-+void Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
-+{
-+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
-+    if (backend == 0) 
-+        return;
-+    backend->createDevice(address);
-+}
-+
-+
-+Solid::Control::BluetoothRemoteDevice* Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceUBI(const QString &ubi) const
-+{
-     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
-     return pair.first;
- }
- 
-+Solid::Control::BluetoothInputDevice* Solid::Control::BluetoothInterface::findBluetoothInputDeviceUBI(const QString &ubi) const
-+{
-+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair = d->findRegisteredBluetoothInputDevice(ubi);
-+    return pair.first;
-+}
-+
-+void Solid::Control::BluetoothInterface::slotDeviceCreated(const QString& ubi)
-+{
-+
-+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
-+    Ifaces::BluetoothRemoteDevice *iface = 0;
-+
-+    if (backend != 0) {
-+        iface = qobject_cast<Ifaces::BluetoothRemoteDevice *>(backend->createBluetoothRemoteDevice(ubi));
-+    }
-+
-+    if (iface != 0) {
-+        BluetoothRemoteDevice *device = new BluetoothRemoteDevice(iface);
-+
-+        QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair(device, iface);
-+        d->remoteDeviceMap[ubi] = pair;
-+    }
-+}
- 
- QString Solid::Control::BluetoothInterface::address() const
- {
-@@ -492,8 +545,6 @@
-         QObject::connect(object, SIGNAL(propertyChanged(const QString &,const QVariant &)),
-                                  parent(), SIGNAL(propertyChanged(const QString &, const QVariant &)));
- 
--
--
-     }
- }
- 
-@@ -521,6 +572,32 @@
-         }
- 
-     }
-+}
-+
-+QPair<Solid::Control::BluetoothInputDevice *, Solid::Control::Ifaces::BluetoothInputDevice *> Solid::Control::BluetoothInterfacePrivate::findRegisteredBluetoothInputDevice(const QString &ubi) const
-+{
-+    if (inputDeviceMap.contains(ubi)) {
-+        return inputDeviceMap[ubi];
-+    } else {
-+        Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(backendObject());
-+        Ifaces::BluetoothInputDevice *iface = 0;
-+
-+        if (backend != 0) {
-+            iface = qobject_cast<Ifaces::BluetoothInputDevice *>(backend->createBluetoothInputDevice(ubi));
-+        }
-+
-+        if (iface != 0) {
-+            BluetoothInputDevice *device = new BluetoothInputDevice(iface);
-+
-+            QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair(device, iface);
-+            inputDeviceMap[ubi] = pair;
-+
-+            return pair;
-+        } else {
-+            return QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *>(0, 0);
-+        }
-+
-+    }
- }
- 
- #include "bluetoothinterface.moc"
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.h kdebase/workspace/libs/solid/control/bluetoothinterface.h
---- 4_2libsControl/bluetoothinterface.h	2009-01-17 17:51:33.000000000 +0100
-+++ libs/solid/control/bluetoothinterface.h	2009-01-14 14:17:14.000000000 +0100
-@@ -28,7 +28,9 @@
- #include <QtCore/QMap>
- 
- #include "bluetoothremotedevice.h"
-+#include "bluetoothinputdevice.h"
- #include "ifaces/bluetoothremotedevice.h"
-+#include "ifaces/bluetoothinputdevice.h"
- 
- 
- 
-@@ -37,7 +39,7 @@
- namespace Control
- {
- class BluetoothRemoteDevice;
--typedef QList<BluetoothRemoteDevice> BluetoothRemoteDeviceList;
-+typedef QList<BluetoothRemoteDevice*> BluetoothRemoteDeviceList;
- class BluetoothInterfacePrivate;
- 
- /**
-@@ -115,7 +117,8 @@
-      * @param ubi the identifier of the bluetooth device to instantiate
-      * @returns a bluetooth object, if a bluetooth device having the given UBI, for this interface exists, 0 otherwise
-      */
--    Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
-+    //Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
-+    void createBluetoothRemoteDevice(const QString &address);
- 
-     /**
-      * Finds a BluetoothRemoteDevice object given its UBI.
-@@ -123,7 +126,13 @@
-      * @param ubi the identifier of the bluetooth remote device to find from this bluetooth interface
-      * @returns a valid BluetoothRemoteDevice object if a remote device having the given UBI for this interface exists, an invalid BluetoothRemoteDevice object otherwise.
-      */
--    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDevice(const QString &address) const;
-+    const QString getBluetoothRemoteDeviceUBI(const QString &address) const;
-+
-+    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDeviceAddr(const QString &addr) const;
-+
-+    Solid::Control::BluetoothRemoteDevice* findBluetoothRemoteDeviceUBI(const QString &ubi) const;
-+
-+    Solid::Control::BluetoothInputDevice* findBluetoothInputDeviceUBI(const QString &ubi) const;
- 
-     /**
-      * Retrieves the MAC address of the bluetooth interface/adapter.
-@@ -296,7 +305,7 @@
- //    bool isTrusted(const QString &);
- 
- 
--    QString createPairedDevice(const QString &, const QString &, const QString &) const;
-+    void createPairedDevice(const QString &, const QString &, const QString &) const;
- 
-     QMap< QString, QVariant > getProperties() const;
- 
-@@ -557,6 +566,9 @@
-     QVariant getProperty(const QString&) const;
-     BluetoothInterfacePrivate * const d;
- 
-+private slots:
-+    void slotDeviceCreated(const QString& ubi);
-+
- };
- 
- } //Control
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.cpp kdebase/workspace/libs/solid/control/bluetoothmanager.cpp
---- 4_2libsControl/bluetoothmanager.cpp	2009-01-17 17:51:33.000000000 +0100
-+++ libs/solid/control/bluetoothmanager.cpp	2009-01-16 13:17:33.000000000 +0100
-@@ -58,6 +58,7 @@
- 
-     void _k_interfaceAdded(const QString &ubi);
-     void _k_interfaceRemoved(const QString &ubi);
-+    void _k_defaultInterfaceChanged(const QString &ubi);
-     void _k_interfaceDestroyed(QObject *object);
- /*
-     void _k_inputDeviceCreated(const QString &ubi);
-@@ -95,7 +96,7 @@
-     typedef QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> BluetoothInterfaceIfacePair;
- 
-     // Delete all the devices, they are now outdated
--    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap) {
-+    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap.values()) {
-         delete pair.first;
-         delete pair.second;
-     }
-@@ -110,6 +111,8 @@
- 
-     if (backend == 0) return list;
- 
-+    kDebug() << "UBI List " << ubiList;
-+
-     foreach (const QString &ubi, ubiList) {
-         QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = d->findRegisteredBluetoothInterface(ubi);
- 
-@@ -239,7 +242,9 @@
- */
- void Solid::Control::BluetoothManagerPrivate::_k_interfaceAdded(const QString &ubi)
- {
--    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
-+    kDebug() << "Size of InterfaceList " << bluetoothInterfaceMap.size();
-+    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = findRegisteredBluetoothInterface(ubi);
-+/*    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
- 
-     if (pair.first != 0) {
-         // Oops, I'm not sure it should happen...
-@@ -247,7 +252,7 @@
- 
-         delete pair.first;
-         delete pair.second;
--    }
-+    }*/
- 
-     emit q->interfaceAdded(ubi);
- }
-@@ -261,11 +266,19 @@
-         delete pair.second;
-     }
- 
-+    Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
-+    backend->removeInterface(ubi);
-     emit q->interfaceRemoved(ubi);
- }
- 
-+void Solid::Control::BluetoothManagerPrivate::_k_defaultInterfaceChanged(const QString &ubi)
-+{
-+    emit q->defaultInterfaceChanged(ubi);
-+}
-+
- void Solid::Control::BluetoothManagerPrivate::_k_interfaceDestroyed(QObject *object)
- {
-+    kDebug() << "Interface detroyed";
-     Ifaces::BluetoothInterface *device = qobject_cast<Ifaces::BluetoothInterface *>(object);
- 
-     if (device != 0) {
-@@ -323,6 +336,9 @@
-                      q, SLOT(_k_interfaceAdded(const QString &)));
-     QObject::connect(newBackend, SIGNAL(interfaceRemoved(const QString &)),
-                      q, SLOT(_k_interfaceRemoved(const QString &)));
-+    QObject::connect(newBackend, SIGNAL(defaultInterfaceChanged(const QString &)),
-+                     q, SLOT(_k_defaultInterfaceChanged(const QString &)));
-+
- /*
-     QObject::connect(newBackend, SIGNAL(inputDeviceCreated(const QString &)),
-                      q, SLOT(_k_inputDeviceCreated(const QString &)));
-@@ -334,17 +350,22 @@
- 
- QPair<Solid::Control::BluetoothInterface *, Solid::Control::Ifaces::BluetoothInterface *> Solid::Control::BluetoothManagerPrivate::findRegisteredBluetoothInterface(const QString &ubi) const
- {
-+
-+    kDebug() << "findRegisteredBluetoothInterface " << ubi;
-     if (bluetoothInterfaceMap.contains(ubi)) {
-         return bluetoothInterfaceMap[ubi];
-     } else {
-+        kDebug() << "Creating New Interface " << ubi;
-         Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
-         Ifaces::BluetoothInterface *iface = 0;
- 
-         if (backend != 0) {
-+            kDebug() << "Calling Backend to Creating New Interface " << ubi;
-             iface = qobject_cast<Ifaces::BluetoothInterface *>(backend->createInterface(ubi));
-         }
- 
-         if (iface != 0) {
-+            kDebug() << "BackendIface created ";
-             BluetoothInterface *device = new BluetoothInterface(iface);
-             QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair(device, iface);
-             QObject::connect(iface, SIGNAL(destroyed(QObject *)),
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.h kdebase/workspace/libs/solid/control/bluetoothmanager.h
---- 4_2libsControl/bluetoothmanager.h	2009-01-17 17:51:33.000000000 +0100
-+++ libs/solid/control/bluetoothmanager.h	2009-01-16 13:17:33.000000000 +0100
-@@ -188,6 +188,7 @@
- 
-     Q_PRIVATE_SLOT(d, void _k_interfaceAdded(const QString &))
-     Q_PRIVATE_SLOT(d, void _k_interfaceRemoved(const QString &))
-+    Q_PRIVATE_SLOT(d, void _k_defaultInterfaceChanged(const QString &))
-     Q_PRIVATE_SLOT(d, void _k_interfaceDestroyed(QObject *))
- /*
-     Q_PRIVATE_SLOT(d, void _k_inputDeviceCreated(const QString &))
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.cpp kdebase/workspace/libs/solid/control/bluetoothremotedevice.cpp
---- 4_2libsControl/bluetoothremotedevice.cpp	2009-01-17 17:51:33.000000000 +0100
-+++ libs/solid/control/bluetoothremotedevice.cpp	2009-01-13 14:53:39.000000000 +0100
-@@ -88,6 +88,15 @@
-     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
- }
- 
-+QVariant Solid::Control::BluetoothRemoteDevice::getProperty(const QString &key)
-+{
-+    QMap<QString, QVariant> props = getProperties();
-+    if (props.contains(key))
-+        return props[key];
-+    else
-+        return QVariant();
-+}
-+
- QStringList Solid::Control::BluetoothRemoteDevice::listNodes()
- {
-     Q_D(const BluetoothRemoteDevice);
-@@ -113,14 +122,65 @@
- }
- 
- 
-+QString Solid::Control::BluetoothRemoteDevice::address()
-+{
-+    QVariant var = getProperty("Address");
-+
-+    if (var.isValid())
-+        return var.value<QString>();
-+    else
-+        return QString();
- 
--/*
--QString Solid::Control::BluetoothRemoteDevice::address() const
-+//    Q_D(const BluetoothRemoteDevice);
-+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
-+}
-+
-+bool Solid::Control::BluetoothRemoteDevice::isTrusted()
- {
--    Q_D(const BluetoothRemoteDevice);
--    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
-+     QVariant var = getProperty("Trusted");
-+
-+    if (var.isValid())
-+        return var.value<bool>();
-+    else
-+        return false;
-+}
-+
-+void Solid::Control::BluetoothRemoteDevice::setTrusted(bool trust)
-+{
-+    setProperty("Trusted",QVariant(trust));
- }
- 
-+QString Solid::Control::BluetoothRemoteDevice::icon()
-+{
-+     QVariant var = getProperty("Icon");
-+
-+    if (var.isValid())
-+        return var.value<QString>();
-+    else
-+        return "";
-+}
-+
-+QStringList Solid::Control::BluetoothRemoteDevice::uuids()
-+{
-+     QVariant var = getProperty("UUIDs");
-+
-+    if (var.isValid())
-+        return var.value<QStringList>();
-+    else
-+        return QStringList();
-+}
-+
-+bool Solid::Control::BluetoothRemoteDevice::isConnected()
-+{
-+     QVariant var = getProperty("Connected");
-+
-+    if (var.isValid())
-+        return var.value<bool>();
-+    else
-+        return false;
-+}
-+
-+/*
- bool Solid::Control::BluetoothRemoteDevice::isConnected() const
- {
-     Q_D(const BluetoothRemoteDevice);
-@@ -168,12 +228,21 @@
-     Q_D(const BluetoothRemoteDevice);
-     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QStringList(), serviceClasses());
- }
--QString Solid::Control::BluetoothRemoteDevice::name() const
-+*/
-+
-+QString Solid::Control::BluetoothRemoteDevice::name()
- {
--    Q_D(const BluetoothRemoteDevice);
--    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
-+    QVariant var = getProperty("Name");
-+
-+    if (var.isValid())
-+        return var.value<QString>();
-+    else
-+        return QString();
-+
-+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
- }
- 
-+/*
- QString Solid::Control::BluetoothRemoteDevice::alias() const
- {
-     Q_D(const BluetoothRemoteDevice);
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.h kdebase/workspace/libs/solid/control/bluetoothremotedevice.h
---- 4_2libsControl/bluetoothremotedevice.h	2009-01-17 17:51:33.000000000 +0100
-+++ libs/solid/control/bluetoothremotedevice.h	2009-01-13 14:53:39.000000000 +0100
-@@ -82,11 +82,46 @@
-     bool operator==(const BluetoothRemoteDevice  & other) const;
- 
-     /**
--     * The UBI of the remote de device.
-+     * The UBI of the remote device.
-      */
-     QString ubi() const;
- 
-     /**
-+     * The address of the remote device.
-+     */
-+    QString address();
-+
-+    /**
-+     * The name of the remote device.
-+     */
-+    QString name();
-+
-+    /**
-+     * The icon of the remote device.
-+     */
-+    QString icon();
-+
-+    /**
-+     * The Trust state of the remote device.
-+     */
-+    bool isTrusted();
-+
-+    /**
-+     * Set the Trust state of the remote device.
-+     */
-+    void setTrusted(bool);
-+
-+    /**
-+     * Returns the service uuids of the remote device.
-+     */
-+    QStringList uuids();
-+
-+    /**
-+     * The Connection state of the remote device.
-+     */
-+    bool isConnected();
-+
-+    /**
-      * Retrieve all properties from the remote device.
-      *
-      * @returns a hash of named properties
-@@ -157,6 +192,9 @@
- 
- private:
-     Q_PRIVATE_SLOT(d_func(), void _k_destroyed(QObject *))
-+
-+
-+    QVariant getProperty(const QString &key);
- };
- 
- } //Control
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothinterface.h kdebase/workspace/libs/solid/control/ifaces/bluetoothinterface.h
---- 4_2libsControl/ifaces/bluetoothinterface.h	2009-01-17 17:51:32.000000000 +0100
-+++ libs/solid/control/ifaces/bluetoothinterface.h	2009-01-16 17:16:55.000000000 +0100
-@@ -240,7 +240,7 @@
-      */
- 
- 
--    virtual QString createPairedDevice(const QString &, const QString &, const QString &) const = 0;
-+    virtual void createPairedDevice(const QString &, const QString &, const QString &) const = 0;
- 
-     virtual QMap< QString, QVariant > getProperties() const = 0;
- 
-@@ -248,7 +248,8 @@
- 
-     virtual QString findDevice(const QString &) const = 0;
- 
--    virtual QString createDevice(const QString &) const = 0;
-+    //virtual QString createDevice(const QString &) const = 0;
-+    virtual void createDevice(const QString &) const = 0;
- 
- 
- 
-@@ -320,7 +321,9 @@
-      * @param ubi the identifier of the bluetooth remote device instantiated
-      * @returns a new BluetoothRemoteDevice object if there's a device having the given UBI, 0 otherwise
-      */
--    virtual QObject *createBluetoothRemoteDevice(const QString &address) = 0;
-+    virtual QObject *createBluetoothRemoteDevice(const QString &ubi) = 0;
-+
-+    virtual QObject *createBluetoothInputDevice(const QString &ubi) = 0;
- 
-     /**
-      * Marks the device as trusted.
-diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothmanager.h kdebase/workspace/libs/solid/control/ifaces/bluetoothmanager.h
---- 4_2libsControl/ifaces/bluetoothmanager.h	2009-01-17 17:51:32.000000000 +0100
-+++ libs/solid/control/ifaces/bluetoothmanager.h	2009-01-16 12:42:32.000000000 +0100
-@@ -89,6 +89,13 @@
-      virtual QObject *createInterface(const QString &ubi) = 0;
- 
-     /**
-+     * Removes a BluetoothInterface object from this backend given its UBI.
-+     *
-+     * @param ubi the identifier of the bluetooth interface instantiated
-+     */
-+     virtual void removeInterface(const QString &ubi) = 0;
-+
-+    /**
-      * Retrieves the list of Universal Bluetooth Identifiers (UBIs) of bluetooth input devices
-      * which are configured in the system. Configured means also not connected devices.
-      *
diff --git a/kde-base/solid/solid-4.2.0.ebuild b/kde-base/solid/solid-4.2.0.ebuild
index 316b489d94e0..7131f3328a9f 100644
--- a/kde-base/solid/solid-4.2.0.ebuild
+++ b/kde-base/solid/solid-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.2.0.ebuild,v 1.1 2009/01/27 18:22:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.2.0.ebuild,v 1.2 2009/01/28 12:47:47 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -8,6 +8,8 @@ KMNAME="kdebase-workspace"
 CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-4.2.0-backport-solid-bluetooth.patch.tar.bz2"
 DESCRIPTION="Solid: the KDE hardware library"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth debug networkmanager"
@@ -31,7 +33,7 @@ KMEXTRA="
 	libs/solid/
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.2.0-backport-solid-bluetooth.patch" )
+PATCHES=( "${DISTDIR}/${PN}-4.2.0-backport-solid-bluetooth.patch.tar.bz2" )
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}