Merge lp:~logan/ubuntu/quantal/cagibi/new-upstream into lp:ubuntu/quantal/cagibi

[Logan Rosen]

[Daniel Holbach (dholbach)]

Thanks a lot!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-08-29 19:29:08 +0000
+++ CMakeLists.txt	2012-06-21 14:28:20 +0000
@@ -1,7 +1,9 @@
 project( Cagibi )
 
 cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
-
+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
+cmake_policy(SET CMP0005 OLD)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_MODULE_PATH "${Cagibi_SOURCE_DIR}/cmake/modules")
 
 find_package( Qt4 REQUIRED COMPONENTS QtCore QtXml QtDBus QtNetwork )
@@ -10,8 +12,34 @@
 find_package(Automoc4 REQUIRED)
 
 set(CAGIBI_VERSION_MAJOR "0")
-set(CAGIBI_VERSION_MINOR "1")
-set(CAGIBI_VERSION_PATCH "1")
+set(CAGIBI_VERSION_MINOR "2")
+set(CAGIBI_VERSION_PATCH "0")
 set(CAGIBI_VERSION "${CAGIBI_VERSION_MAJOR}.${CAGIBI_VERSION_MINOR}.${CAGIBI_VERSION_PATCH}")
 
+
+if (NOT DEFINED SYSCONF_INSTALL_DIR)
+  if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
+    set(SYSCONF_INSTALL_DIR  "/etc") # conform to LFSH
+  else("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
+    set(SYSCONF_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/etc")
+  endif("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
+else (NOT DEFINED SYSCONF_INSTALL_DIR)
+  set(SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}" CACHE STRING "The sysconfig install dir")
+endif (NOT DEFINED SYSCONF_INSTALL_DIR)
+
+
+if (NOT DEFINED CAGIBI_DAEMON_SHUTDOWN_SECS)
+  set(CAGIBI_DAEMON_SHUTDOWN_SECS "0" CACHE STRING "Default time without services and activity to trigger shutdown (0 = no shutdown)")
+endif()
+
+if (NOT DEFINED CAGIBI_DAEMON_SEARCH_TIMEOUT_SECS)
+  set(CAGIBI_DAEMON_SEARCH_TIMEOUT_SECS "3" CACHE STRING "Default search timeout when querying for devices on a new network")
+endif()
+
+add_definitions(
+  -DCAGIBI_DAEMON_SHUTDOWN_SECS=${CAGIBI_DAEMON_SHUTDOWN_SECS}
+  -DCAGIBI_DAEMON_SEARCH_TIMEOUT_SECS=${CAGIBI_DAEMON_SEARCH_TIMEOUT_SECS}
+  -DSYSCONF_INSTALL_DIR=\\"${SYSCONF_INSTALL_DIR}\\"
+)
+
 add_subdirectory( daemon )

=== added file 'Changelog'
--- Changelog	1970-01-01 00:00:00 +0000
+++ Changelog	2012-06-21 14:28:20 +0000
@@ -0,0 +1,13 @@
+0.2.0
+* split /org/kde/Cagibi object into DeviceList and Control objects
+* option to set search timeout
+* config file to adjust behaviour
+* option to shutdown on no UPnP activity
+* running on system D-Bus
+* deviceDetails as lookuptable, D-Bus signature a{ss}
+
+0.1.1
+* fixed: exec path in D-Bus service file missed subdir bin
+
+0.1.0
+* initial release

=== modified file 'README'
--- README	2010-07-29 11:43:50 +0000
+++ README	2012-06-21 14:28:20 +0000
@@ -20,3 +20,41 @@
 
 
 * http://en.wikipedia.org/wiki/Simple_Service_Discovery_Protocol
+
+
+Building
+--------
+The buildsystem is based on cmake, please read the cmake documentation if you
+are unfamiliar with it.
+There are currently two parameters you can overwrite on configuring,
+CAGIBI_DAEMON_SHUTDOWN_SECS and CAGIBI_DAEMON_SEARCH_TIMEOUT_SECS. Look into
+CMakeLists.txt in the toplevel dir for more information about these.
+
+
+Using
+-----
+The Cagibi daemon exposes two object in its D-Bus service org.kde.Cagibi:
+* /org/kde/Cagibi/DeviceList, with interface org.kde.Cagibi.DeviceList
+* /org/kde/Cagibi/Control, with interface org.kde.Cagibi.Control
+
+The first object does the actual caching of the UPnP device data. The second
+object is used to control the general behaviour of the daemon.
+
+Clients will query the DeviceList for the device data and also listen to its
+signals about new or disappeared devices. If the Cagibi daemon is shutdown, it
+will simply signal the disappearing of all known UPnP devices, even if they will
+stay for longer on the network.
+On a (not to be expected, but better prepared) crash of the daemon with an
+automatic restart by the init system (if integrated) or a manually done one it
+is up to the clients how to deal with that, the Cagibi daemon will just start as
+usual and search for UPnP devices starting of an empty list and emit
+signals for any it finds, even if already reported before the crash. A client
+would e.g. listen to the serviceOwnerChanged D-Bus signal and put all devices it
+uses to an unknown state if the service disappears from the D-Bus, then on
+reappearing of it compare all signaled-as-new devices to those with unknown
+state and after some timeout simply treat those still unknown as disappeared.
+In a more simple version the client would just treat all devices as disappeared
+if the Cagibi service is lost, but this could result in quite some unneeded
+activity even though the services (e.g. MediaServer) are still present and it's
+just a small drop-out of the discovery proxy.
+Having said that, so far Cagibi is not reported to crash at all :)
\ No newline at end of file

=== added file 'TODO'
--- TODO	1970-01-01 00:00:00 +0000
+++ TODO	2012-06-21 14:28:20 +0000
@@ -0,0 +1,14 @@
+For 0.2:
+* shutdown really needed in D-Bus api? usecase (besides development)?
+
+For some future version:
+* add log file
+* react on available networks (e.g. proxy to NetworkManager)
+  or should init/serviced do this? how to broadcast just on new network?
+* proper behaviour on reconnection:
+  (is there a way to discover the network is the same? even with same subnetwork adress could be a different one, so needs to query again, unless there is a proper way)
+* browser tool which lists current cache
+* restrict the networks listened on
+* restrict the type of devices which is listened for (whitelist/blacklist)
+* option to reparse config while running? triggered on D-Bus? on setting file(s) touched?
+* add support for broadcasting, both dynamically as by installed files

=== modified file 'VERSION'
--- VERSION	2010-08-29 19:29:08 +0000
+++ VERSION	2012-06-21 14:28:20 +0000
@@ -1,1 +1,1 @@
-0.1.1
+0.2.0

=== removed file 'cagibi.lsm'
--- cagibi.lsm	2010-08-29 19:29:08 +0000
+++ cagibi.lsm	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Begin4
-Title:          Cagibi
-Version:        0.1.1
-Entered-date:   2010-08-08
-Description:    an experimental cache/proxy system for the SSDP (Simple Service Discovery Protocol) part of UPnP
-Cagibi aims to be to SSDP what Avahi is to DNS-SD/Zeroconf:
-a cache caching all service/device announcements on the network in a local process
-as well as being a broker serving local announcements to the network.
-Both should be done by a single daemon process, accessable via D-Bus on the system bus.
-The cache should offer active queries, so another process is only informed about changes
-about UPnP devices it is interested in.
-This is a prototype, active reimplementation (e.g. integration in Avahi) welcome :)
-Keywords:       upnp ssdp proxy cache daemon
-Author:         [e-mail] (Friedrich W. H. Kossebau)
-Maintained-by:  [e-mail] (Friedrich W. H. Kossebau)
-Primary-site:   ftp://ftp.kde.org/pub/kde/stable/cagibi
-Platforms:      
-Copying-policy: GPL
-End

=== modified file 'daemon/CMakeLists.txt'
--- daemon/CMakeLists.txt	2010-08-29 19:29:08 +0000
+++ daemon/CMakeLists.txt	2012-06-21 14:28:20 +0000
@@ -11,9 +11,15 @@
     device.cpp
     rootdevice.cpp
     ssdpwatcher.cpp
-    upnpproxy.cpp
-    upnpproxydbusadaptor.cpp
+
+    devicelist.cpp
+    devicelistdbusadaptor.cpp
     dbuscodec.cpp
+
+    control.cpp
+    controldbusadaptor.cpp
+
+    daemon.cpp
     main.cpp
 )
 
@@ -29,10 +35,16 @@
 install( TARGETS cagibid  RUNTIME DESTINATION bin )
 
 configure_file( org.kde.Cagibi.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Cagibi.service )
-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Cagibi.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services )
-
-if (NOT WIN32)
-    configure_file( cagibi.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cagibi.pc )
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cagibi.pc
-             DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig )
-endif (NOT WIN32)
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Cagibi.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/system-services )
+install( FILES org.kde.Cagibi.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/ )
+
+set( cagibid_CONF_NAME cagibid.conf )
+set( cagibid_CONF ${CMAKE_CURRENT_BINARY_DIR}/${cagibid_CONF_NAME} )
+configure_file( ${cagibid_CONF_NAME}.cmake ${cagibid_CONF} )
+install( FILES ${cagibid_CONF}  DESTINATION ${SYSCONF_INSTALL_DIR} )
+
+set( cagibid_DBUS_API
+    org.kde.Cagibi.Control.xml
+    org.kde.Cagibi.DeviceList.xml
+)
+install( FILES ${cagibid_DBUS_API} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces )

=== removed file 'daemon/cagibi.pc.cmake'
--- daemon/cagibi.pc.cmake	2010-08-29 19:29:08 +0000
+++ daemon/cagibi.pc.cmake	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}/bin
-
-Name: Cagibi daemon
-Description: experimental cache/proxy system for the SSDP (Simple Service Discovery Protocol) part of UPnP.
-Version: ${CAGIBI_VERSION}
-Requires: QtCore QtXml QtNetwork QtDBus

=== added file 'daemon/cagibid.conf.cmake'
--- daemon/cagibid.conf.cmake	1970-01-01 00:00:00 +0000
+++ daemon/cagibid.conf.cmake	2012-06-21 14:28:20 +0000
@@ -0,0 +1,12 @@
+[General]
+# Time (in sec) waited after querying for devices on a new network connection,
+# before the query is considered done.
+# Default time is @CAGIBI_DAEMON_SEARCH_TIMEOUT_SECS@.
+# Uncomment the following line to change this time, in the example to 5 secs:
+# SearchTimeout = 5
+
+# Time (in sec) without any discovered services and any client query
+# activity after which a shutdown of the daemon is triggered (0 = no shutdown).
+# Default time is @CAGIBI_DAEMON_SHUTDOWN_SECS@.
+# Uncomment the following line to change this time, in the example to 23 secs:
+# ShutDownTimeout = 23

=== added file 'daemon/control.cpp'
--- daemon/control.cpp	1970-01-01 00:00:00 +0000
+++ daemon/control.cpp	2012-06-21 14:28:20 +0000
@@ -0,0 +1,42 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "control.h"
+
+// program
+#include "daemon.h"
+
+namespace Cagibi
+{
+
+Control::Control( Daemon* daemon )
+  : QObject(),
+    mDaemon( daemon )
+{
+}
+
+void Control::shutDown()
+{
+    mDaemon->quit();
+}
+
+}

=== added file 'daemon/control.h'
--- daemon/control.h	1970-01-01 00:00:00 +0000
+++ daemon/control.h	2012-06-21 14:28:20 +0000
@@ -0,0 +1,51 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONTROL_H
+#define CONTROL_H
+
+// Qt
+#include <QtCore/QObject>
+
+namespace Cagibi
+{
+class Daemon;
+
+
+class Control : public QObject
+{
+    Q_OBJECT
+
+  public:
+    explicit Control( Daemon* daemon );
+
+  public Q_SLOTS:
+    // shut the proxy server down
+    void shutDown();
+
+  private:
+    Daemon* mDaemon;
+};
+
+}
+
+#endif

=== added file 'daemon/controldbusadaptor.cpp'
--- daemon/controldbusadaptor.cpp	1970-01-01 00:00:00 +0000
+++ daemon/controldbusadaptor.cpp	2012-06-21 14:28:20 +0000
@@ -0,0 +1,39 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "controldbusadaptor.h"
+
+namespace Cagibi
+{
+
+ControlDBusAdaptor::ControlDBusAdaptor( Control* parent )
+  : QDBusAbstractAdaptor( parent )
+{
+}
+
+void ControlDBusAdaptor::shutDown()
+{
+    parent()->shutDown();
+}
+
+
+}

=== added file 'daemon/controldbusadaptor.h'
--- daemon/controldbusadaptor.h	1970-01-01 00:00:00 +0000
+++ daemon/controldbusadaptor.h	2012-06-21 14:28:20 +0000
@@ -0,0 +1,55 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONTROLDBUSADAPTOR_H
+#define CONTROLDBUSADAPTOR_H
+
+// program
+#include "control.h"
+// Qt
+#include <QtDBus/QtDBus>
+
+
+namespace Cagibi
+{
+
+class ControlDBusAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.Cagibi.Control")
+
+  public:
+    explicit ControlDBusAdaptor( Control* parent );
+
+  public:
+    Control* parent() const;
+
+  public Q_SLOTS:
+    Q_NOREPLY void shutDown();
+};
+
+
+inline Control* ControlDBusAdaptor::parent() const { return static_cast<Control*>( QObject::parent() ); }
+
+}
+
+#endif

=== added file 'daemon/daemon.cpp'
--- daemon/daemon.cpp	1970-01-01 00:00:00 +0000
+++ daemon/daemon.cpp	2012-06-21 14:28:20 +0000
@@ -0,0 +1,78 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy 
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// program
+#include "devicelistdbusadaptor.h"
+#include "devicelist.h"
+#include "controldbusadaptor.h"
+#include "control.h"
+#include "daemon.h"
+// Qt
+#include <QtCore/QSettings>
+#include <QtCore/QCoreApplication>
+
+
+namespace Cagibi
+{
+
+static const int defaultShutDownTimeout = CAGIBI_DAEMON_SHUTDOWN_SECS;
+static const int defaultSearchTimeout = CAGIBI_DAEMON_SEARCH_TIMEOUT_SECS;
+
+Daemon::Daemon( int argc, char* argv[] )
+  : QCoreApplication( argc, argv )
+{
+}
+
+
+int Daemon::exec()
+{
+    // read settings
+    QSettings::setPath( QSettings::NativeFormat, QSettings::SystemScope,
+                        QLatin1String(SYSCONF_INSTALL_DIR) );
+    QSettings settings( QSettings::SystemScope, QLatin1String("cagibid") );
+    int shutDownTimeout =
+        settings.value( QLatin1String("ShutDownTimeout"),
+                        defaultShutDownTimeout ).toInt();
+    const int searchTimeout =
+        settings.value( QLatin1String("SearchTimeout"),
+                        defaultSearchTimeout ).toInt();
+
+    // publish service on D-Bus
+    QDBusConnection dBusConnection = QDBusConnection::systemBus();
+    dBusConnection.registerService( QLatin1String("org.kde.Cagibi") );
+
+    DeviceList deviceList( searchTimeout, shutDownTimeout );
+    connect( &deviceList, SIGNAL(gotInactiv()), SLOT(quit()) );
+    new DeviceListDBusAdaptor( &deviceList );
+    dBusConnection.registerObject( QLatin1String("/org/kde/Cagibi/DeviceList"), &deviceList );
+
+    Control control( this );
+    new ControlDBusAdaptor( &control );
+    dBusConnection.registerObject( QLatin1String("/org/kde/Cagibi/Control"), &control );
+
+    // do the mainloop
+    const int result = QCoreApplication::exec();
+
+    return result;
+}
+
+}

=== added file 'daemon/daemon.h'
--- daemon/daemon.h	1970-01-01 00:00:00 +0000
+++ daemon/daemon.h	2012-06-21 14:28:20 +0000
@@ -0,0 +1,43 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy 
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DAEMON_H
+#define DAEMON_H
+
+// Qt
+#include <QtCore/QCoreApplication>
+
+namespace Cagibi
+{
+
+class Daemon : public QCoreApplication
+{
+  public:
+    Daemon( int argc, char* argv[] );
+
+  public:
+    int exec();
+};
+
+}
+
+#endif

=== modified file 'daemon/dbuscodec.cpp'
--- daemon/dbuscodec.cpp	2010-07-29 11:43:50 +0000
+++ daemon/dbuscodec.cpp	2012-06-21 14:28:20 +0000
@@ -1,7 +1,7 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
-    Copyright 2010 Friedrich W. H. Kossebau <[e-mail]>
+    Copyright 2010-2011 Friedrich W. H. Kossebau <[e-mail]>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -29,74 +29,87 @@
 #include <QtDBus/QDBusArgument>
 #include <QtCore/QUrl>
 
+static const QString type = QLatin1String( "deviceType" );
+static const QString friendlyName = QLatin1String( "friendlyName" );
+static const QString manufacturerName = QLatin1String( "manufacturer" );
+static const QString modelDescription = QLatin1String( "modelDescription" );
+static const QString modelName = QLatin1String( "modelName" );
+static const QString modelNumber = QLatin1String( "modelNumber" );
+static const QString serialNumber = QLatin1String( "serialNumber" );
+static const QString udn = QLatin1String( "UDN" );
+static const QString presentationUrl = QLatin1String( "presentationURL" );
+static const QString ipAddress = QLatin1String( "ipAddress" );
+static const QString portNumber = QLatin1String( "ipPortNumber" );
+static const QString parentDeviceUdn = QLatin1String( "parentDeviceUDN" );
+
 
 QDBusArgument& operator<<( QDBusArgument& argument, const Cagibi::Device& device )
 {
-    const Cagibi::DevicePrivate* devicePrivate = device.d.constData();
-
-    argument.beginStructure();
-
-    argument << devicePrivate->type()
-             << devicePrivate->friendlyName()
-             << devicePrivate->manufacturerName()
+    const Cagibi::DevicePrivate* const devicePrivate = device.d.constData();
+    const Cagibi::RootDevice* const rootDevice = devicePrivate->rootDevice();
+    const bool isValid = ( rootDevice != 0 );
+
+    argument.beginMap( QVariant::String, QVariant::String );
+    if( isValid ) // is not valid e.g. if tested for signature
+    {
+        argument.beginMapEntry();
+            argument << type << devicePrivate->type();
+        argument.endMapEntry();
+        argument.beginMapEntry();
+            argument << friendlyName << devicePrivate->friendlyName();
+        argument.endMapEntry();
+        argument.beginMapEntry();
+            argument << manufacturerName << devicePrivate->manufacturerName();
+        argument.endMapEntry();
 //     const QString& manufacturerUrl() const;
-             << devicePrivate->modelDescription()
-             << devicePrivate->modelName()
-             << devicePrivate->modelNumber()
-             << devicePrivate->serialNumber()
-             << devicePrivate->udn()
+        argument.beginMapEntry();
+            argument << modelDescription << devicePrivate->modelDescription();
+        argument.endMapEntry();
+        argument.beginMapEntry();
+            argument << modelName << devicePrivate->modelName();
+        argument.endMapEntry();
+        argument.beginMapEntry();
+            argument << modelNumber << devicePrivate->modelNumber();
+        argument.endMapEntry();
+        argument.beginMapEntry();
+            argument << serialNumber << devicePrivate->serialNumber();
+        argument.endMapEntry();
+        argument.beginMapEntry();
+            argument << udn << devicePrivate->udn();
+        argument.endMapEntry();
 //     const QString upc() const;
-             << devicePrivate->presentationUrl();
-
-    Cagibi::RootDevice* rootDevice = devicePrivate->rootDevice();
-    QUrl location = rootDevice ? rootDevice->location() : QUrl();
-    argument << location.host()
-             << location.port();
-
-    argument << ( devicePrivate->hasParentDevice() ?
-        devicePrivate->parentDevice().udn() :
-        QString() );
-
+        argument.beginMapEntry();
+            argument << presentationUrl << devicePrivate->presentationUrl();
+        argument.endMapEntry();
+
+        const QUrl& location = rootDevice->location();
+        argument.beginMapEntry();
+            argument << ipAddress << location.host();
+        argument.endMapEntry();
+        argument.beginMapEntry();
+            argument << portNumber << QString::number(location.port());
+        argument.endMapEntry();
+
+        if( devicePrivate->hasParentDevice() )
+        {
+        argument.beginMapEntry();
+            argument << parentDeviceUdn << devicePrivate->parentDevice().udn();
+        argument.endMapEntry();
+        }
 //     const QList<Icon>& icons() const;
 //     const QList<Service>& services() const;
 //     const QList<Device>& devices() const;
-
-    argument.endStructure();
+    }
+    argument.endMap();
 
     return argument;
 }
 
+// not used currently, so noop, but symbol needed for QtDBus integration
 const QDBusArgument& operator>>( const QDBusArgument& argument,
                                  Cagibi::Device& device )
 {
-    Cagibi::DevicePrivate* devicePrivate = device.d.data();
-
-    argument.beginStructure();
-
-    argument >> devicePrivate->mType
-             >> devicePrivate->mFriendlyName
-             >> devicePrivate->mManufacturerName
-//     const QString& manufacturerUrl() const;
-             >> devicePrivate->mModelDescription
-             >> devicePrivate->mModelName
-             >> devicePrivate->mModelNumber
-             >> devicePrivate->mSerialNumber
-             >> devicePrivate->mUdn
-//     const QString upc() const;
-             >> devicePrivate->mPresentationUrl;
-
-
-    QString parentDeviceUdn;
-    argument >> parentDeviceUdn;
-//     << ( devicePrivate->hasParentDevice() ?
-//         devicePrivate->parentDevice().udn() :
-//         QString() );
-
-//     const QList<Icon>& icons() const;
-//     const QList<Service>& services() const;
-//     const QList<Device>& devices() const;
-
-    argument.endStructure();
+    Q_UNUSED( device )
 
     return argument;
 }

=== modified file 'daemon/dbuscodec.h'
--- daemon/dbuscodec.h	2010-07-29 11:43:50 +0000
+++ daemon/dbuscodec.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2010 Friedrich W. H. Kossebau <[e-mail]>
 
@@ -27,7 +27,6 @@
 #include "device.h"
 // Qt
 #include <QtCore/QMetaType>
-// #include <QtCore/QVector>
 
 class QDBusArgument;
 QDBusArgument& operator<<( QDBusArgument& argument,
@@ -36,6 +35,5 @@
                                  Cagibi::Device& device );
 
 Q_DECLARE_METATYPE( Cagibi::Device )
-// Q_DECLARE_METATYPE( QVector<Cagibi::Device> )
 
 #endif

=== modified file 'daemon/device.cpp'
--- daemon/device.cpp	2010-07-29 11:43:50 +0000
+++ daemon/device.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/device.h'
--- daemon/device.h	2010-07-29 11:43:50 +0000
+++ daemon/device.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/device_p.cpp'
--- daemon/device_p.cpp	2010-07-29 11:43:50 +0000
+++ daemon/device_p.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 
@@ -45,7 +45,7 @@
 
 void DevicePrivate::addIcon( const Icon& icon )
 {
-qDebug()<<icon.url()<<icon.width()<<"x"<<icon.height();
+// qDebug()<<icon.url()<<icon.width()<<"x"<<icon.height();
     mIcons.append( icon );
 }
 
@@ -54,7 +54,7 @@
     const QString& type = service.type();
     const QString actionId =  QString::fromLatin1( "GetStatusInfo" );
     const QString& url = service.controlUrl();
-qDebug()<<type<<url;
+// qDebug()<<type<<url;
 // TODO
 #if 0
     mSoapAgent->sendCommand( type, actionId, url, QVariant::fromValue<Service>(service) );
@@ -66,7 +66,7 @@
 
 void DevicePrivate::addDevice( const Device& device )
 {
-qDebug()<<device.friendlyName();
+// qDebug()<<device.friendlyName();
     device.d.data()->setParentDevicePrivate( this );
     mDevices.append( device );
 }

=== modified file 'daemon/device_p.h'
--- daemon/device_p.h	2010-07-29 11:43:50 +0000
+++ daemon/device_p.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/devicedescriptionxmlhandler.cpp'
--- daemon/devicedescriptionxmlhandler.cpp	2010-07-29 11:43:50 +0000
+++ daemon/devicedescriptionxmlhandler.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 
@@ -167,7 +167,6 @@
         mCurrentDevice.setRootDevice( mRootDevice );
         if( mStatusStack.top() == RootElement )
         {
-qDebug()<<mCurrentDevice.friendlyName();
             mRootDevice->setDevice( mCurrentDevice );
         }
         else

=== modified file 'daemon/devicedescriptionxmlhandler.h'
--- daemon/devicedescriptionxmlhandler.h	2010-07-29 11:43:50 +0000
+++ daemon/devicedescriptionxmlhandler.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009 Friedrich W. H. Kossebau <[e-mail]>
 

=== added file 'daemon/devicelist.cpp'
--- daemon/devicelist.cpp	1970-01-01 00:00:00 +0000
+++ daemon/devicelist.cpp	2012-06-21 14:28:20 +0000
@@ -0,0 +1,223 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2010-2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "devicelist.h"
+
+// program
+#include "ssdpwatcher.h"
+#include "rootdevice.h"
+#include "device.h"
+// Qt
+#include <QtCore/QTimer>
+
+
+namespace Cagibi
+{
+
+static void fillMap( DeviceTypeMap& map, const Device& device )
+{
+    map.insert( device.udn(), device.type() );
+    foreach( const Cagibi::Device& subDevice, device.devices() )
+        fillMap( map, subDevice );
+}
+
+static void fillMapByType( DeviceTypeMap& map, const Device& device,
+                           const QString& type )
+{
+    const QString deviceType = device.type();
+
+    if( deviceType == type )
+        map.insert( device.udn(), deviceType );
+
+    foreach( const Cagibi::Device& subDevice, device.devices() )
+        fillMapByType( map, subDevice, type );
+}
+
+static const Device* find( const Device& device, const QString& udn )
+{
+    const Device* result = 0;
+
+    if( device.udn() == udn )
+        result = &device;
+    else
+    {
+        foreach( const Cagibi::Device& subDevice, device.devices() )
+        {
+            result = find( subDevice, udn );
+            if( result )
+                break;
+        }
+    }
+
+    return result;
+}
+
+
+DeviceList::DeviceList( int searchTimeout, int inactivityTimeout )
+  : QObject(),
+    mSsdpWatcher( new SSDPWatcher(this) ),
+    mShutDownTimeout( inactivityTimeout )
+{
+    // setup timer to shutdown on no UPnP activity
+    mShutDownTimer = new QTimer( this );
+    mShutDownTimer->setInterval( mShutDownTimeout * 1000 ); // in msec
+    mShutDownTimer->setSingleShot( true );
+    connect( mShutDownTimer, SIGNAL(timeout()),
+             this, SIGNAL(gotInactiv()) );
+
+    // install listener to UPnP changes
+    connect( mSsdpWatcher, SIGNAL(deviceDiscovered( Cagibi::RootDevice* )),
+             SLOT(onDeviceDiscovered( Cagibi::RootDevice* )) );
+    connect( mSsdpWatcher, SIGNAL(deviceRemoved( Cagibi::RootDevice* )),
+             SLOT(onDeviceRemoved( Cagibi::RootDevice* )) );
+    connect( mSsdpWatcher, SIGNAL(initialSearchCompleted()),
+             SLOT(onInitialSearchCompleted()) );
+
+    mSsdpWatcher->startDiscover( searchTimeout );
+}
+
+DeviceTypeMap DeviceList::allDevices() const
+{
+    DeviceTypeMap result;
+
+    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
+
+    foreach( RootDevice* rootDevice, rootDevices )
+    {
+        const Device device = rootDevice->device();
+        fillMap( result, device );
+    }
+
+    // being used, so reset the shutdown timer if active
+    if( mShutDownTimer->isActive() )
+        mShutDownTimer->start();
+
+    return result;
+}
+
+DeviceTypeMap DeviceList::devicesByParent( const QString& udn ) const
+{
+    DeviceTypeMap result;
+
+    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
+
+    foreach( RootDevice* rootDevice, rootDevices )
+    {
+        const Device device = rootDevice->device();
+
+        if( udn.isEmpty() )
+            result.insert( device.udn(), device.type() );
+        else
+        {
+            const Device* match = find( device, udn );
+            if( match )
+            {
+                foreach( const Cagibi::Device& subDevice, device.devices() )
+                    result.insert( subDevice.udn(), subDevice.type() );
+                break;
+            }
+        }
+    }
+
+    // being used, so reset the shutdown timer if active
+    if( mShutDownTimer->isActive() )
+        mShutDownTimer->start();
+
+    return result;
+}
+
+DeviceTypeMap DeviceList::devicesByType( const QString& type ) const
+{
+    DeviceTypeMap result;
+
+    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
+
+    foreach( RootDevice* rootDevice, rootDevices )
+    {
+        const Device device = rootDevice->device();
+        fillMapByType( result, device, type );
+    }
+
+    return result;
+}
+
+Device DeviceList::deviceDetails( const QString& udn ) const
+{
+    Device result;
+
+    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
+
+    foreach( RootDevice* rootDevice, rootDevices )
+    {
+        const Device device = rootDevice->device();
+
+        const Device* match = find( device, udn );
+        if( match )
+        {
+            result = *match;
+            break;
+        }
+    }
+
+    return result;
+}
+
+void DeviceList::onInitialSearchCompleted()
+{
+    if( shutsDownOnNoActivity() && mSsdpWatcher->devicesCount() == 0 )
+        mShutDownTimer->start();
+}
+
+void DeviceList::onDeviceDiscovered( RootDevice* rootDevice )
+{
+    DeviceTypeMap devices;
+
+    const Device device = rootDevice->device();
+    fillMap( devices, device );
+
+    mShutDownTimer->stop();
+
+    emit devicesAdded( devices );
+}
+
+void DeviceList::onDeviceRemoved( RootDevice* rootDevice )
+{
+    DeviceTypeMap devices;
+
+    const Device device = rootDevice->device();
+    fillMap( devices, device );
+
+    if( shutsDownOnNoActivity() && mSsdpWatcher->devicesCount() == 0 )
+        mShutDownTimer->start();
+
+    emit devicesRemoved( devices );
+}
+
+DeviceList::~DeviceList()
+{
+    // simulate that all devices are removed
+    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
+    foreach( RootDevice* rootDevice, rootDevices )
+        onDeviceRemoved( rootDevice );
+}
+
+}

=== added file 'daemon/devicelist.h'
--- daemon/devicelist.h	1970-01-01 00:00:00 +0000
+++ daemon/devicelist.h	2012-06-21 14:28:20 +0000
@@ -0,0 +1,84 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2010-2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEVICELIST_H
+#define DEVICELIST_H
+
+// Qt
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QString>
+#include <QtCore/QMetaType>
+
+class QTimer;
+
+typedef QHash<QString,QString> DeviceTypeMap;
+Q_DECLARE_METATYPE( DeviceTypeMap )
+
+
+namespace Cagibi
+{
+class SSDPWatcher;
+class RootDevice;
+class Device;
+
+
+class DeviceList : public QObject
+{
+    Q_OBJECT
+
+  public:
+    explicit DeviceList( int searchTimeout, int inactivityTimeout );
+    virtual ~DeviceList();
+
+  public:
+    DeviceTypeMap allDevices() const;
+    DeviceTypeMap devicesByParent( const QString& udn ) const;
+    DeviceTypeMap devicesByType( const QString& type ) const;
+    Device deviceDetails( const QString& udn ) const;
+
+  Q_SIGNALS:
+    void devicesAdded( const DeviceTypeMap& devices );
+    void devicesRemoved( const DeviceTypeMap& devices );
+
+    void gotInactiv();
+
+  private Q_SLOTS:
+    void onInitialSearchCompleted();
+    void onDeviceDiscovered( Cagibi::RootDevice* rootDevice );
+    void onDeviceRemoved( Cagibi::RootDevice* rootDevice );
+
+  private:
+    bool shutsDownOnNoActivity() const;
+
+  private:
+    SSDPWatcher* mSsdpWatcher;
+    QTimer* mShutDownTimer;
+
+    int mShutDownTimeout;
+};
+
+inline bool DeviceList::shutsDownOnNoActivity() const { return mShutDownTimeout != 0; }
+
+}
+
+#endif

=== added file 'daemon/devicelistdbusadaptor.cpp'
--- daemon/devicelistdbusadaptor.cpp	1970-01-01 00:00:00 +0000
+++ daemon/devicelistdbusadaptor.cpp	2012-06-21 14:28:20 +0000
@@ -0,0 +1,71 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2010-2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "devicelistdbusadaptor.h"
+
+// daemon
+#include "dbuscodec.h"
+// Qt
+#include <QtDBus/QDBusMetaType>
+
+
+namespace Cagibi
+{
+
+DeviceListDBusAdaptor::DeviceListDBusAdaptor( DeviceList* parent )
+  : QDBusAbstractAdaptor( parent )
+{
+    connect( parent, SIGNAL(devicesAdded(DeviceTypeMap)),
+             SIGNAL(devicesAdded(DeviceTypeMap)) );
+    connect( parent, SIGNAL(devicesRemoved(DeviceTypeMap)),
+             SIGNAL(devicesRemoved(DeviceTypeMap)) );
+
+    // TODO: best place to do this?
+    qDBusRegisterMetaType<DeviceTypeMap>();
+    qDBusRegisterMetaType<Cagibi::Device>();
+}
+
+DeviceTypeMap DeviceListDBusAdaptor::allDevices() const
+{
+    return parent()->allDevices();
+}
+
+DeviceTypeMap DeviceListDBusAdaptor::devicesByParent( const QString& udn ) const
+{
+    return parent()->devicesByParent( udn );
+}
+
+DeviceTypeMap DeviceListDBusAdaptor::devicesByType( const QString& type ) const
+{
+    return parent()->devicesByType( type );
+}
+
+Device DeviceListDBusAdaptor::deviceDetails( const QString& udn ) const
+{
+    return parent()->deviceDetails( udn );
+}
+
+DeviceListDBusAdaptor::~DeviceListDBusAdaptor()
+{
+}
+
+}

=== added file 'daemon/devicelistdbusadaptor.h'
--- daemon/devicelistdbusadaptor.h	1970-01-01 00:00:00 +0000
+++ daemon/devicelistdbusadaptor.h	2012-06-21 14:28:20 +0000
@@ -0,0 +1,65 @@
+/*
+    This file is part of the Cagibi daemon.
+
+    Copyright 2010-2011 Friedrich W. H. Kossebau <[e-mail]>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+    the License or (at your option) version 3 or any later version
+    accepted by the membership of KDE e.V. (or its successor approved
+    by the membership of KDE e.V.), which shall act as a proxy
+    defined in Section 14 of version 3 of the license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEVICELISTDBUSADAPTOR_H
+#define DEVICELISTDBUSADAPTOR_H
+
+// program
+#include "devicelist.h"
+#include "dbuscodec.h"
+// Qt
+#include <QtDBus/QtDBus>
+
+
+namespace Cagibi
+{
+
+class DeviceListDBusAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.Cagibi.DeviceList")
+
+  public:
+    explicit DeviceListDBusAdaptor( DeviceList* parent );
+
+    virtual ~DeviceListDBusAdaptor();
+
+  public:
+    DeviceList* parent() const;
+
+  public Q_SLOTS:
+    DeviceTypeMap allDevices() const;
+    DeviceTypeMap devicesByParent( const QString& udn ) const;
+    DeviceTypeMap devicesByType( const QString& type ) const;
+    Cagibi::Device deviceDetails( const QString& udn ) const;
+
+  Q_SIGNALS:
+    void devicesAdded( const DeviceTypeMap& devices );
+    void devicesRemoved( const DeviceTypeMap& devices );
+};
+
+
+inline DeviceList* DeviceListDBusAdaptor::parent() const { return static_cast<DeviceList*>( QObject::parent() ); }
+
+}
+
+#endif

=== modified file 'daemon/icon.cpp'
--- daemon/icon.cpp	2010-07-29 11:43:50 +0000
+++ daemon/icon.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/icon.h'
--- daemon/icon.h	2010-07-29 11:43:50 +0000
+++ daemon/icon.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/icon_p.cpp'
--- daemon/icon_p.cpp	2010-07-29 11:43:50 +0000
+++ daemon/icon_p.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/icon_p.h'
--- daemon/icon_p.h	2010-07-29 11:43:50 +0000
+++ daemon/icon_p.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/main.cpp'
--- daemon/main.cpp	2010-07-29 11:43:50 +0000
+++ daemon/main.cpp	2012-06-21 14:28:20 +0000
@@ -1,7 +1,7 @@
 /*
-    This file is part of the Cagibi daemon, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
-    Copyright 2009 Friedrich W. H. Kossebau <[e-mail]>
+    Copyright 2009,2011 Friedrich W. H. Kossebau <[e-mail]>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -21,26 +21,14 @@
 */
 
 // program
-#include "upnpproxy.h"
-// Qt
-#include <QtDBus/QDBusConnection>
-#include <QtCore/QCoreApplication>
+#include "daemon.h"
 
-// #include <KApplication>
-// #include <kaboutdata.h>
-// #include <kcmdlineargs.h>
 
 int main( int argc, char* argv[] )
 {
-    QCoreApplication programCore( argc, argv );
-//     KAboutData about("cagibi", "cagibi", ki18n("Cagibi Daemon"), "", ki18n("Cagibi Daemon"), KAboutData::License_GPL, ki18n("Copyright icke"));
-
-//     KCmdLineArgs::init(argc, argv, &about);
-//     KApplication programCore;
-
-    new Cagibi::UPnPProxy();
-
-    const int result = programCore.exec();
+    Cagibi::Daemon daemon( argc, argv );
+
+    const int result = daemon.exec();
 
     return result;
 }

=== added file 'daemon/org.kde.Cagibi.Control.xml'
--- daemon/org.kde.Cagibi.Control.xml	1970-01-01 00:00:00 +0000
+++ daemon/org.kde.Cagibi.Control.xml	2012-06-21 14:28:20 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<interface name="org.kde.Cagibi.Control">
+    <!-- METHODS -->
+
+    <method name="shutDown">
+        <tp:docstring>
+        Shuts the proxy server down.
+        </tp:docstring>
+        <annotation name="org.freedesktop.DBus.Method.NoReply" value="true" />
+    </method>
+
+</interface>
+</node>
\ No newline at end of file

=== added file 'daemon/org.kde.Cagibi.DeviceList.xml'
--- daemon/org.kde.Cagibi.DeviceList.xml	1970-01-01 00:00:00 +0000
+++ daemon/org.kde.Cagibi.DeviceList.xml	2012-06-21 14:28:20 +0000
@@ -0,0 +1,96 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<interface name="org.kde.Cagibi.DeviceList">
+    <!-- METHODS -->
+
+    <method name="allDevices">
+        <tp:docstring>
+        Get the list of UPnP devices currently discovered.
+        </tp:docstring>
+        <arg type="a{ss}" direction="out">
+            <tp:docstring>
+            A list of the devices as pairs of first udn and second type.
+            </tp:docstring>
+        </arg>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QHash&lt;QString,QString&gt;" />
+    </method>
+
+    <method name="devicesByParent">
+        <tp:docstring>
+        Get the list of UPnP devices currently discovered which have the device with
+        the given udn as parent device.
+        </tp:docstring>
+        <arg name="udn" type="s" direction="in"/>
+        <arg type="a{ss}" direction="out">
+            <tp:docstring>
+            A list of the devices as pairs of first udn and second type.
+            </tp:docstring>
+        </arg>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QHash&lt;QString,QString&gt;" />
+    </method>
+
+    <method name="devicesByType">
+        <tp:docstring>
+        Get the list of UPnP devices currently discovered which are of the given type.
+        </tp:docstring>
+        <arg name="type" type="s" direction="in"/>
+        <arg type="a{ss}" direction="out">
+            <tp:docstring>
+            A list of the devices as pairs of first udn and second type.
+            </tp:docstring>
+        </arg>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QHash&lt;QString,QString&gt;" />
+    </method>
+
+    <method name="deviceDetails">
+        <tp:docstring>
+        Get the details of the device with the given udn.
+        </tp:docstring>
+        <arg name="udn" type="s" direction="in"/>
+        <arg type="a{ss}" direction="out">
+            <tp:docstring>
+            Details of the device, passed in a StringStringMap. Keys are:
+            deviceType,
+            friendlyName,
+            manufacturer,
+            modelDescription,
+            modelName,
+            modelNumber,
+            serialNumber,
+            UDN,
+            presentationURL,
+            ipAddress,
+            ipPortNumber,
+            parentDeviceUDN
+            </tp:docstring>
+        </arg>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QHash&lt;QString,QString&gt;" />
+    </method>
+
+    <!-- SIGNALS -->
+
+    <signal name="devicesAdded">
+        <tp:docstring>
+        One or more devices have been discovered on the network.
+        </tp:docstring>
+        <arg name="devices" type="a{ss}" direction="out">
+            <tp:docstring>
+            A list of the devices as pairs of first udn and second type.
+            </tp:docstring>
+        </arg>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QHash&lt;QString,QString&gt;" />
+    </signal>
+
+    <signal name="devicesRemoved">
+        <tp:docstring>
+        One or more devices have disappeared from the network.
+        </tp:docstring>
+        <arg name="devices" type="a{ss}" direction="out">
+            <tp:docstring>
+            A list of the devices as pairs of first udn and second type.
+            </tp:docstring>
+        </arg>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QHash&lt;QString,QString&gt;" />
+    </signal>
+</interface>
+</node>
\ No newline at end of file

=== added file 'daemon/org.kde.Cagibi.conf'
--- daemon/org.kde.Cagibi.conf	1970-01-01 00:00:00 +0000
+++ daemon/org.kde.Cagibi.conf	2012-06-21 14:28:20 +0000
@@ -0,0 +1,11 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy user="root">
+    <allow own="org.kde.Cagibi"/>
+  </policy>
+  <policy context="default">
+    <allow send_destination="org.kde.Cagibi" />
+  </policy>
+</busconfig>

=== modified file 'daemon/org.kde.Cagibi.service.cmake'
--- daemon/org.kde.Cagibi.service.cmake	2010-08-29 19:29:08 +0000
+++ daemon/org.kde.Cagibi.service.cmake	2012-06-21 14:28:20 +0000
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.kde.Cagibi
 Exec=${CMAKE_INSTALL_PREFIX}/bin/cagibid
+User=root

=== removed file 'daemon/org.kde.Cagibi.xml'
--- daemon/org.kde.Cagibi.xml	2010-07-29 11:43:50 +0000
+++ daemon/org.kde.Cagibi.xml	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-<interface name="org.kde.Cagibi">
-    <!-- METHODS -->
-
-    <method name="allDevices">
-        <tp:docstring>
-        Get the list of UPnP devices currently discovered.
-        </tp:docstring>
-        <arg type="a{ss}" direction="out">
-            <tp:docstring>
-            A list of the devices as pairs of first udn and second type.
-            </tp:docstring>
-        </arg>
-    </method>
-
-    <method name="devicesByParent">
-        <tp:docstring>
-        Get the list of UPnP devices currently discovered which have the device with
-        the given udn as parent device.
-        </tp:docstring>
-        <arg name="udn" type="s" direction="in"/>
-        <arg type="a{ss}" direction="out">
-            <tp:docstring>
-            A list of the devices as pairs of first udn and second type.
-            </tp:docstring>
-        </arg>
-    </method>
-
-    <method name="devicesByType">
-        <tp:docstring>
-        Get the list of UPnP devices currently discovered which are of the given type.
-        </tp:docstring>
-        <arg name="type" type="s" direction="in"/>
-        <arg type="a{ss}" direction="out">
-            <tp:docstring>
-            A list of the devices as pairs of first udn and second type.
-            </tp:docstring>
-        </arg>
-    </method>
-
-    <method name="deviceDetails">
-        <tp:docstring>
-        Get the details of the device with the given udn.
-        </tp:docstring>
-        <arg name="udn" type="s" direction="in"/>
-        <arg type="(ssssssssssis)" direction="out">
-            <tp:docstring>
-            Details of the device. TODO: turn into StringVariantMap to be extendable
-            </tp:docstring>
-        </arg>
-    </method>
-
-    <!-- SIGNALS -->
-
-    <signal name="devicesAdded">
-        <tp:docstring>
-        One or more devices have been discovered on the network.
-        </tp:docstring>
-        <arg name="devices" type="a{ss}" direction="out">
-            <tp:docstring>
-            A list of the devices as pairs of first udn and second type.
-            </tp:docstring>
-        </arg>
-    </signal>
-
-    <signal name="devicesRemoved">
-        <tp:docstring>
-        One or more devices have disappeared from the network.
-        </tp:docstring>
-        <arg name="devices" type="a{ss}" direction="out">
-            <tp:docstring>
-            A list of the devices as pairs of first udn and second type.
-            </tp:docstring>
-        </arg>
-    </signal>
-</interface>
-</node>
\ No newline at end of file

=== modified file 'daemon/rootdevice.cpp'
--- daemon/rootdevice.cpp	2010-07-29 11:43:50 +0000
+++ daemon/rootdevice.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 
@@ -86,7 +86,7 @@
     else
     {
         const QByteArray deviceDescriptionData = reply->readAll();
-qDebug()<< QString::fromAscii(deviceDescriptionData);
+// qDebug()<< QString::fromAscii(deviceDescriptionData);
         success = parseDeviceDescription( this, deviceDescriptionData, &mError );
     }
     reply->deleteLater();

=== modified file 'daemon/rootdevice.h'
--- daemon/rootdevice.h	2010-07-29 11:43:50 +0000
+++ daemon/rootdevice.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/service.cpp'
--- daemon/service.cpp	2010-07-29 11:43:50 +0000
+++ daemon/service.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/service.h'
--- daemon/service.h	2010-07-29 11:43:50 +0000
+++ daemon/service.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/service_p.cpp'
--- daemon/service_p.cpp	2010-07-29 11:43:50 +0000
+++ daemon/service_p.cpp	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/service_p.h'
--- daemon/service_p.h	2010-07-29 11:43:50 +0000
+++ daemon/service_p.h	2012-06-21 14:28:20 +0000
@@ -1,5 +1,5 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
     Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
 

=== modified file 'daemon/ssdpwatcher.cpp'
--- daemon/ssdpwatcher.cpp	2010-07-29 11:43:50 +0000
+++ daemon/ssdpwatcher.cpp	2012-06-21 14:28:20 +0000
@@ -1,7 +1,7 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
-    Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
+    Copyright 2009-2011 Friedrich W. H. Kossebau <[e-mail]>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,7 @@
 #include "rootdevice.h"
 // Qt
 #include <QtNetwork/QUdpSocket>
+#include <QtCore/QTimer>
 #include <QtCore/QUrl>
 #include <QtCore/QStringList>
 // C
@@ -111,22 +112,22 @@
 }
 
 
-void SSDPWatcher::discover()
+void SSDPWatcher::startDiscover( int searchTimeout )
 {
 qDebug() << "Trying to find UPnP devices on the local network";
 
     // send a HTTP M-SEARCH message to 239.255.255.250:1900
-    const char mSearchMessage[] =
+    const QByteArray searchMessage =
         "M-SEARCH * HTTP/1.1\r\n"
         "HOST: "SSDP_BROADCAST_ADDRESS":"SSDP_PORT"\r\n"
         "ST:"ROOTDEVICE"\r\n"
 //         "ST: ssdp:all\r\n"
         "MAN:\"ssdp:discover\"\r\n"
-        "MX:3\r\n" // max number of seconds to wait for response
+        "MX:" + QByteArray::number(searchTimeout) + "\r\n" // max number of seconds to wait for response
         "\r\n";
-    const int mSearchMessageLength = sizeof(mSearchMessage) / sizeof(mSearchMessage[0]);
 
-    mUdpSocket->writeDatagram( mSearchMessage, mSearchMessageLength, QHostAddress(SSDPBroadCastAddress), SSDPPortNumber );
+    mUdpSocket->writeDatagram( searchMessage.constData(), searchMessage.size(), QHostAddress(SSDPBroadCastAddress), SSDPPortNumber );
+    QTimer::singleShot( searchTimeout * 1000, this, SLOT(onSearchTimeout()) );
 }
 
 
@@ -332,7 +333,6 @@
     if( bytesRead == -1 )
         // TODO: error handling
         return;
-qDebug()<<QString::fromAscii(message);
 
     handleMessage( message );
 }
@@ -344,6 +344,10 @@
 qDebug() << "SSDPWatcher Error : " << mUdpSocket->errorString();
 }
 
+void SSDPWatcher::onSearchTimeout()
+{
+    emit initialSearchCompleted();
+}
 
 SSDPWatcher::~SSDPWatcher()
 {

=== modified file 'daemon/ssdpwatcher.h'
--- daemon/ssdpwatcher.h	2010-07-29 11:43:50 +0000
+++ daemon/ssdpwatcher.h	2012-06-21 14:28:20 +0000
@@ -1,7 +1,7 @@
 /*
-    This file is part of the Cagibi library, part of the KDE project.
+    This file is part of the Cagibi daemon.
 
-    Copyright 2009-2010 Friedrich W. H. Kossebau <[e-mail]>
+    Copyright 2009-2011 Friedrich W. H. Kossebau <[e-mail]>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -50,9 +50,10 @@
     QList<RootDevice*> devices() const;
 
   public Q_SLOTS:
-    void discover();
+    void startDiscover( int searchTimeout );
 
   Q_SIGNALS:
+    void initialSearchCompleted();
     void deviceDiscovered( Cagibi::RootDevice* device );
     void deviceRemoved( Cagibi::RootDevice* device );
 
@@ -64,6 +65,7 @@
     void onUdpSocketError( QAbstractSocket::SocketError error );
     void onDeviceDescriptionDownloadDone( RootDevice* device, bool success );
     void onCacheTimedOut( RootDevice* device );
+    void onSearchTimeout();
 
   protected:
     QHash<QString,RootDevice*> mDevices;

=== removed file 'daemon/upnpproxy.cpp'
--- daemon/upnpproxy.cpp	2010-07-29 11:43:50 +0000
+++ daemon/upnpproxy.cpp	1970-01-01 00:00:00 +0000
@@ -1,195 +0,0 @@
-/*
-    This file is part of the Cagibi daemon, part of the KDE project.
-
-    Copyright 2010 Friedrich W. H. Kossebau <[e-mail]>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of
-    the License or (at your option) version 3 or any later version
-    accepted by the membership of KDE e.V. (or its successor approved
-    by the membership of KDE e.V.), which shall act as a proxy
-    defined in Section 14 of version 3 of the license.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "upnpproxy.h"
-
-// program
-#include "upnpproxydbusadaptor.h"
-#include "ssdpwatcher.h"
-#include "rootdevice.h"
-#include "device.h"
-
-#include <QtCore/QDebug>
-
-namespace Cagibi
-{
-
-static void fillMap( DeviceTypeMap& map, const Device& device )
-{
-    map.insert( device.udn(), device.type() );
-    foreach( const Cagibi::Device& subDevice, device.devices() )
-        fillMap( map, subDevice );
-}
-
-static void fillMapByType( DeviceTypeMap& map, const Device& device,
-                           const QString& type )
-{
-    const QString deviceType = device.type();
-
-    if( deviceType == type )
-        map.insert( device.udn(), deviceType );
-
-    foreach( const Cagibi::Device& subDevice, device.devices() )
-        fillMapByType( map, subDevice, type );
-}
-
-static const Device* find( const Device& device, const QString& udn )
-{
-    const Device* result = 0;
-
-    if( device.udn() == udn )
-        result = &device;
-    else
-    {
-        foreach( const Cagibi::Device& subDevice, device.devices() )
-        {
-            result = find( subDevice, udn );
-            if( result )
-                break;
-        }
-    }
-
-    return result;
-}
-
-
-UPnPProxy::UPnPProxy( QObject* parent )
-  : QObject( parent ),
-    mSsdpWatcher( new SSDPWatcher(this) )
-{
-    new UPnPProxyDBusAdaptor( this );
-
-    QDBusConnection sessionBus = QDBusConnection::sessionBus();
-    sessionBus.registerService( QString::fromLatin1("org.kde.Cagibi") );
-    sessionBus.registerObject( QString::fromLatin1("/org/kde/Cagibi"), this );
-
-    connect( mSsdpWatcher, SIGNAL(deviceDiscovered( Cagibi::RootDevice* )),
-             SLOT(onDeviceDiscovered( Cagibi::RootDevice* )) );
-    connect( mSsdpWatcher, SIGNAL(deviceRemoved( Cagibi::RootDevice* )),
-             SLOT(onDeviceRemoved( Cagibi::RootDevice* )) );
-
-    mSsdpWatcher->discover();
-}
-
-DeviceTypeMap UPnPProxy::allDevices() const
-{
-    DeviceTypeMap result;
-
-    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
-
-    foreach( RootDevice* rootDevice, rootDevices )
-    {
-        const Device device = rootDevice->device();
-        fillMap( result, device );
-    }
-
-    return result;
-}
-
-DeviceTypeMap UPnPProxy::devicesByParent( const QString& udn ) const
-{
-    DeviceTypeMap result;
-
-    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
-
-    foreach( RootDevice* rootDevice, rootDevices )
-    {
-        const Device device = rootDevice->device();
-
-        if( udn.isEmpty() )
-            result.insert( device.udn(), device.type() );
-        else
-        {
-            const Device* match = find( device, udn );
-            if( match )
-            {
-                foreach( const Cagibi::Device& subDevice, device.devices() )
-                    result.insert( subDevice.udn(), subDevice.type() );
-                break;
-            }
-        }
-    }
-
-    return result;
-}
-
-DeviceTypeMap UPnPProxy::devicesByType( const QString& type ) const
-{
-    DeviceTypeMap result;
-
-    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
-
-    foreach( RootDevice* rootDevice, rootDevices )
-    {
-        const Device device = rootDevice->device();
-        fillMapByType( result, device, type );
-    }
-
-    return result;
-}
-
-Device UPnPProxy::deviceDetails( const QString& udn ) const
-{
-    Device result;
-
-    const QList<RootDevice*> rootDevices = mSsdpWatcher->devices();
-
-    foreach( RootDevice* rootDevice, rootDevices )
-    {
-        const Device device = rootDevice->device();
-
-        const Device* match = find( device, udn );
-        if( match )
-        {
-            result = *match;
-            break;
-        }
-    }
-
-    return result;
-}
-
-void UPnPProxy::onDeviceDiscovered( RootDevice* rootDevice )
-{
-    DeviceTypeMap devices;
-
-    const Device device = rootDevice->device();
-    fillMap( devices, device );
-
-    emit devicesAdded( devices );
-}
-
-void UPnPProxy::onDeviceRemoved( RootDevice* rootDevice )
-{
-    DeviceTypeMap devices;
-
-    const Device device = rootDevice->device();
-    fillMap( devices, device );
-
-    emit devicesRemoved( devices );
-}
-
-UPnPProxy::~UPnPProxy()
-{
-}
-
-}

=== removed file 'daemon/upnpproxy.h'
--- daemon/upnpproxy.h	2010-07-29 11:43:50 +0000
+++ daemon/upnpproxy.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
-    This file is part of the Cagibi daemon, part of the KDE project.
-
-    Copyright 2010 Friedrich W. H. Kossebau <[e-mail]>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of
-    the License or (at your option) version 3 or any later version
-    accepted by the membership of KDE e.V. (or its successor approved
-    by the membership of KDE e.V.), which shall act as a proxy
-    defined in Section 14 of version 3 of the license.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef UPNPPROXY_H
-#define UPNPPROXY_H
-
-// Qt
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QMetaType>
-
-typedef QHash<QString,QString> DeviceTypeMap;
-Q_DECLARE_METATYPE( DeviceTypeMap )
-
-
-namespace Cagibi
-{
-class SSDPWatcher;
-class RootDevice;
-class Device;
-
-
-class UPnPProxy : public QObject
-{
-    Q_OBJECT
-
-  public:
-    explicit UPnPProxy( QObject* parent = 0 );
-    virtual ~UPnPProxy();
-
-  public:
-    DeviceTypeMap allDevices() const;
-    DeviceTypeMap devicesByParent( const QString& udn ) const;
-    DeviceTypeMap devicesByType( const QString& type ) const;
-    Device deviceDetails( const QString& udn ) const;
-
-  Q_SIGNALS:
-    void devicesAdded( const DeviceTypeMap& devices );
-    void devicesRemoved( const DeviceTypeMap& devices );
-
-  private Q_SLOTS:
-    void onDeviceDiscovered( Cagibi::RootDevice* rootDevice );
-    void onDeviceRemoved( Cagibi::RootDevice* rootDevice );
-
-  private:
-    SSDPWatcher* mSsdpWatcher;
-};
-
-}
-
-#endif

=== removed file 'daemon/upnpproxydbusadaptor.cpp'
--- daemon/upnpproxydbusadaptor.cpp	2010-07-29 11:43:50 +0000
+++ daemon/upnpproxydbusadaptor.cpp	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
-    This file is part of the Cagibi daemon, part of the KDE project.
-
-    Copyright 2010 Friedrich W. H. Kossebau <[e-mail]>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of
-    the License or (at your option) version 3 or any later version
-    accepted by the membership of KDE e.V. (or its successor approved
-    by the membership of KDE e.V.), which shall act as a proxy
-    defined in Section 14 of version 3 of the license.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "upnpproxydbusadaptor.h"
-
-// daemon
-#include "dbuscodec.h"
-// Qt
-#include <QtDBus/QDBusMetaType>
-
-
-namespace Cagibi
-{
-
-UPnPProxyDBusAdaptor::UPnPProxyDBusAdaptor( UPnPProxy* parent )
-  : QDBusAbstractAdaptor( parent )
-{
-    connect( parent, SIGNAL(devicesAdded(DeviceTypeMap)),
-             SIGNAL(devicesAdded(DeviceTypeMap)) );
-    connect( parent, SIGNAL(devicesRemoved(DeviceTypeMap)),
-             SIGNAL(devicesRemoved(DeviceTypeMap)) );
-
-    // TODO: best place to do this?
-    qDBusRegisterMetaType<DeviceTypeMap>();
-    qDBusRegisterMetaType<Cagibi::Device>();
-}
-
-DeviceTypeMap UPnPProxyDBusAdaptor::allDevices() const
-{
-    return parent()->allDevices();
-}
-
-DeviceTypeMap UPnPProxyDBusAdaptor::devicesByParent( const QString& udn ) const
-{
-    return parent()->devicesByParent( udn );
-}
-
-DeviceTypeMap UPnPProxyDBusAdaptor::devicesByType( const QString& type ) const
-{
-    return parent()->devicesByType( type );
-}
-
-Device UPnPProxyDBusAdaptor::deviceDetails( const QString& udn ) const
-{
-    return parent()->deviceDetails( udn );
-}
-
-UPnPProxyDBusAdaptor::~UPnPProxyDBusAdaptor()
-{
-}
-
-}

=== removed file 'daemon/upnpproxydbusadaptor.h'
--- daemon/upnpproxydbusadaptor.h	2010-07-29 11:43:50 +0000
+++ daemon/upnpproxydbusadaptor.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
-    This file is part of the Cagibi daemon, part of the KDE project.
-
-    Copyright 2010 Friedrich W. H. Kossebau <[e-mail]>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of
-    the License or (at your option) version 3 or any later version
-    accepted by the membership of KDE e.V. (or its successor approved
-    by the membership of KDE e.V.), which shall act as a proxy
-    defined in Section 14 of version 3 of the license.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef UPNPPROXYDBUSADAPTOR_H
-#define UPNPPROXYDBUSADAPTOR_H
-
-// program
-#include "upnpproxy.h"
-#include "dbuscodec.h"
-// Qt
-#include <QtDBus/QtDBus>
-#include <QtCore/QObject>
-
-
-namespace Cagibi
-{
-
-class UPnPProxyDBusAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.Cagibi")
-
-  public:
-    explicit UPnPProxyDBusAdaptor( UPnPProxy* parent );
-
-    virtual ~UPnPProxyDBusAdaptor();
-
-  public:
-    UPnPProxy* parent() const;
-
-  public Q_SLOTS:
-    DeviceTypeMap allDevices() const;
-    DeviceTypeMap devicesByParent( const QString& udn ) const;
-    DeviceTypeMap devicesByType( const QString& type ) const;
-    Cagibi::Device deviceDetails( const QString& udn ) const;
-
-  Q_SIGNALS:
-    void devicesAdded( const DeviceTypeMap& devices );
-    void devicesRemoved( const DeviceTypeMap& devices );
-};
-
-
-inline UPnPProxy* UPnPProxyDBusAdaptor::parent() const { return static_cast<UPnPProxy*>( QObject::parent() ); }
-
-}
-
-#endif

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-29 19:29:08 +0000
+++ debian/changelog	2012-06-21 14:28:20 +0000
@@ -1,3 +1,10 @@
+cagibi (0.2.0-0ubuntu1) quantal; urgency=low
+
+  * New upstream release (LP: #1013914).
+  * Update Standards-Version to 3.9.3.
+
+ -- Logan Rosen <[e-mail]>  Thu, 21 Jun 2012 10:15:39 -0400
+
 cagibi (0.1.1-0ubuntu1) maverick; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-08-29 19:29:08 +0000
+++ debian/control	2012-06-21 14:28:20 +0000
@@ -3,7 +3,7 @@
 Maintainer: Kubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Jonathan Riddell <[e-mail]>
 Build-Depends: debhelper (>= 7.3), cmake, automoc, libqt4-dev, pkg-kde-tools
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Section: kde
 
 Package: cagibi