Merge lp:~unity-api-team/indicator-network/port-to-qdbus-14.09 into lp:indicator-network/14.09

[Pete Woods]

Port all dbus interactions to QDBus

Port all dbus interactions to QDBus

[lp:~unity-api-team/indicator-network/port-to-qdbus-14.09]

474. By Pete Woods on 2015-04-01

Insert the WifiLinkItem before the settings item

475. By Pete Woods on 2015-04-01

Cleanup

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-16 18:34:37 +0000
+++ CMakeLists.txt	2015-04-01 15:30:55 +0000
@@ -18,6 +18,10 @@
   add_definitions(-DINDICATOR_NETWORK_TRACE_MESSAGES)
 endif()
 
+add_definitions(
+  -DQT_NO_KEYWORDS=1
+)
+
 find_package(PkgConfig REQUIRED)
 include(EnableCoverageReport)
 include(GNUInstallDirs)
@@ -44,14 +48,6 @@
 )
 include_directories(${GLIB_INCLUDE_DIRS})
 
-set(NM_REQUIRED_VERSION 0.9)
-pkg_check_modules(
-  NM REQUIRED
-  libnm-glib>=${NM_REQUIRED_VERSION}
-  libnm-util>=${NM_REQUIRED_VERSION}
-)
-include_directories(${NM_INCLUDE_DIRS})
-
 set(OFONO_REQUIRED_VERSION 1.12)
 pkg_check_modules(
   OFONO REQUIRED
@@ -85,16 +81,12 @@
 pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1 REQUIRED)
 include_directories(${QTDBUSMOCK_INCLUDE_DIRS})
 
-pkg_check_modules(QMENUMODEL REQUIRED qmenumodel REQUIRED)
-include_directories(${QMENUMODEL_INCLUDE_DIRS})
-
 pkg_check_modules(GIO REQUIRED gio-2.0>=${GLIB_REQUIRED_VERSION})
 include_directories(${GIO_INCLUDE_DIRS})
 
+set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(GObjectIntrospection 0.9.12)
-
 include_directories(${CMAKE_BINARY_DIR})
 
 set(COMMON_FLAGS "-Wall -Wextra -Wpedantic -fno-permissive -fPIC -fvisibility=hidden -pthread")
@@ -102,7 +94,7 @@
 # "nice bug" in cmake... http://www.cmake.org/Bug/view.php?id=15058
 # let's not set C_FLAGS as it will break pthreads detection \o/
 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${COMMON_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${COMMON_FLAGS} -fno-strict-aliasing -fvisibility-inlines-hidden")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 ${COMMON_FLAGS} -fno-strict-aliasing -fvisibility-inlines-hidden")
 
 configure_file(
   "config.h.in"
@@ -136,5 +128,6 @@
         ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
 )
 
-enable_coverage_report(TARGETS menumodel_cpp connectivity-cpp indicator-secret-agent
+#///! TODO: The following needs to be updated once this project takes form again and new unit tests are written
+enable_coverage_report(TARGETS menumodel_cpp indicator-secret-agent
                        FILTER ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)

=== removed file 'cmake/FindGObjectIntrospection.cmake'
--- cmake/FindGObjectIntrospection.cmake	2013-08-27 13:48:41 +0000
+++ cmake/FindGObjectIntrospection.cmake	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# - try to find gobject-introspection
-#
-# Once done this will define
-#
-#  INTROSPECTION_FOUND - system has gobject-introspection
-#  INTROSPECTION_SCANNER - the gobject-introspection scanner, g-ir-scanner
-#  INTROSPECTION_COMPILER - the gobject-introspection compiler, g-ir-compiler
-#  INTROSPECTION_GENERATE - the gobject-introspection generate, g-ir-generate
-#  INTROSPECTION_GIRDIR
-#  INTROSPECTION_TYPELIBDIR
-#  INTROSPECTION_CFLAGS
-#  INTROSPECTION_LIBS
-#
-# Copyright (C) 2010, Pino Toscano, <[e-mail]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname)
-  execute_process(
-    COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=${_varname} gobject-introspection-1.0
-    OUTPUT_VARIABLE _result
-    RESULT_VARIABLE _null
-  )
-
-  if (_null)
-  else()
-    string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
-    string(REGEX REPLACE " +$" ""  _result "${_result}")
-    separate_arguments(_result)
-    set(${_outvar} ${_result} CACHE INTERNAL "")
-  endif()
-endmacro(_GIR_GET_PKGCONFIG_VAR)
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-  if(PACKAGE_FIND_VERSION_COUNT GREATER 0)
-    set(_gir_version_cmp ">=${PACKAGE_FIND_VERSION}")
-  endif()
-  pkg_check_modules(_pc_gir gobject-introspection-1.0${_gir_version_cmp})
-  if(_pc_gir_FOUND)
-    set(INTROSPECTION_FOUND TRUE)
-    _gir_get_pkgconfig_var(INTROSPECTION_SCANNER "g_ir_scanner")
-    _gir_get_pkgconfig_var(INTROSPECTION_COMPILER "g_ir_compiler")
-    _gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate")
-    _gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir")
-    _gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir")
-    set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
-    set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
-  endif()
-endif()
-
-mark_as_advanced(
-  INTROSPECTION_SCANNER
-  INTROSPECTION_COMPILER
-  INTROSPECTION_GENERATE
-  INTROSPECTION_GIRDIR
-  INTROSPECTION_TYPELIBDIR
-  INTROSPECTION_CFLAGS
-  INTROSPECTION_LIBS
-)

=== modified file 'cmake/FindValgrind.cmake'
--- cmake/FindValgrind.cmake	2013-09-17 13:43:54 +0000
+++ cmake/FindValgrind.cmake	2015-04-01 15:30:55 +0000
@@ -14,10 +14,7 @@
 	set(VALGRIND_PROGRAM_OPTIONS
 		"--suppressions=${CMAKE_SOURCE_DIR}/tests/data/valgrind.suppression"
 		"--error-exitcode=1"
-		"--trace-children=yes"
-		"--trace-children-skip=*/python*,python*"
 		"--leak-check=full"
-		"--leak-resolution=high"
 		"--gen-suppressions=all"
 		"--quiet"
 	)
@@ -28,14 +25,17 @@
 	VALGRIND_PROGRAM
 )
 
-function(add_valgrind_test NAME EXECUTABLE)
-	if(ENABLE_MEMCHECK_OPTION)
-		add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
-		set_tests_properties(
-			${NAME}
-			PROPERTIES ENVIRONMENT "G_SLICE=always-malloc G_DEBUG=gc-friendly"
-		)
-	else()
-		add_test(${NAME} ${EXECUTABLE})
-	endif()
+function(add_valgrind_test)
+        foreach(_arg ${ARGN})
+                if ("VALGRIND" STREQUAL ${_arg})
+                        if(ENABLE_MEMCHECK_OPTION AND VALGRIND_PROGRAM)
+                                list(APPEND _vgargs ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS})
+                        endif()
+                else()
+                        list(APPEND _vgargs ${_arg})
+                endif()
+        endforeach()
+
+        add_test(${_vgargs})
 endfunction()
+

=== removed file 'cmake/UseGObjectIntrospection.cmake'
--- cmake/UseGObjectIntrospection.cmake	2013-08-27 13:48:41 +0000
+++ cmake/UseGObjectIntrospection.cmake	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-# Copyright (C) 2010, Pino Toscano, <[e-mail]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(ListOperations)
-
-macro(_gir_list_prefix _outvar _listvar _prefix)
-  set(${_outvar})
-  foreach(_item IN LISTS ${_listvar})
-    list(APPEND ${_outvar} ${_prefix}${_item})
-  endforeach()
-endmacro(_gir_list_prefix)
-
-macro(gir_add_introspections introspections_girs)
-
-  foreach(gir IN LISTS ${introspections_girs})
-
-    set(_gir_name "${gir}")
-
-    ## Transform the gir filename to something which can reference through a variable
-    ## without automake/make complaining, eg Gtk-2.0.gir -> Gtk_2_0_gir
-    string(REPLACE "-" "_" _gir_name "${_gir_name}")
-    string(REPLACE "." "_" _gir_name "${_gir_name}")
-
-    # Namespace and Version is either fetched from the gir filename
-    # or the _NAMESPACE/_VERSION variable combo
-    set(_gir_namespace "${${_gir_name}_NAMESPACE}")
-    if (_gir_namespace STREQUAL "")
-      string(REGEX REPLACE "([^-]+)-.*" "\\1" _gir_namespace "${gir}")
-    endif ()
-    set(_gir_version "${${_gir_name}_VERSION}")
-    if (_gir_version STREQUAL "")
-      string(REGEX REPLACE ".*-([^-]+).gir" "\\1" _gir_version "${gir}")
-    endif ()
-
-    # _PROGRAM is an optional variable which needs it's own --program argument
-    set(_gir_program "${${_gir_name}_PROGRAM}")
-    if (NOT _gir_program STREQUAL "")
-      set(_gir_program "--program=${_gir_program}")
-    endif ()
-
-    # Variables which provides a list of things
-    _gir_list_prefix(_gir_libraries ${_gir_name}_LIBS "--library=")
-    _gir_list_prefix(_gir_packages ${_gir_name}_PACKAGES "--pkg=")
-    _gir_list_prefix(_gir_includes ${_gir_name}_INCLUDES "--include=")
-    _gir_list_prefix(_gir_export_packages ${_gir_name}_EXPORT_PACKAGES "--pkg-export=")
-
-    # Reuse the LIBTOOL variable from by automake if it's set
-    set(_gir_libtool "--no-libtool")
-
-    add_custom_command(
-      COMMAND ${INTROSPECTION_SCANNER}
-              ${INTROSPECTION_SCANNER_ARGS}
-              --namespace=${_gir_namespace}
-              --nsversion=${_gir_version}
-              ${_gir_libtool}
-              ${_gir_program}
-              ${_gir_libraries}
-              ${_gir_packages}
-              ${_gir_includes}
-              ${_gir_export_packages}
-              ${${_gir_name}_SCANNERFLAGS}
-              ${${_gir_name}_CFLAGS}
-              ${${_gir_name}_FILES}
-              --output ${CMAKE_CURRENT_BINARY_DIR}/${gir}
-      DEPENDS ${${_gir_name}_FILES}
-              ${${_gir_name}_LIBS}
-      OUTPUT ${gir}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      VERBATIM
-    )
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${gir} DESTINATION share/gir-1.0)
-
-    string(REPLACE ".gir" ".typelib" _typelib "${gir}")
-    add_custom_command(
-      COMMAND ${INTROSPECTION_COMPILER}
-              ${INTROSPECTION_COMPILER_ARGS}
-              --includedir=.
-              ${CMAKE_CURRENT_BINARY_DIR}/${gir}
-              -o ${CMAKE_CURRENT_BINARY_DIR}/${_typelib}
-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir}
-      OUTPUT ${_typelib}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_typelib} DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0)
-
-    add_custom_target(gir-${gir} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir})
-    add_custom_target(gir-typelibs-${_typelib} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_typelib})
-  endforeach()
-
-endmacro(gir_add_introspections)
-
-macro(gir_get_cflags _output)
-  get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
-  list_prefix(_includes _tmp_includes "-I")
-  get_directory_property(_tmp_compile_definitions COMPILE_DEFINITIONS)
-  list_prefix(_compile_definitions _tmp_compile_definitions "-D")
-  set(${_output} ${_includes} ${_compile_definitions})
-endmacro(gir_get_cflags)

=== added file 'data/com.ubuntu.connectivity1.NetworkingStatus.xml'
--- data/com.ubuntu.connectivity1.NetworkingStatus.xml	1970-01-01 00:00:00 +0000
+++ data/com.ubuntu.connectivity1.NetworkingStatus.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/com/ubuntu/connectivity1/NetworkingStatus" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+    <interface name="com.ubuntu.connectivity1.NetworkingStatus">
+
+        <property name="Limitations" type="as" access="read"/>
+        <property name="Status" type="s" access="read"/>
+
+    </interface>
+</node>
+

=== added file 'data/com.ubuntu.connectivity1.Private.xml'
--- data/com.ubuntu.connectivity1.Private.xml	1970-01-01 00:00:00 +0000
+++ data/com.ubuntu.connectivity1.Private.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/com/ubuntu/connectivity1/Private" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+    <interface name="com.ubuntu.connectivity1.Private">
+
+        <method name="UnlockAllModems">
+        </method>
+
+        <method name="UnlockModem">
+            <arg type="s" direction="in" name="modem"/>
+        </method>
+
+    </interface>
+</node>
+

=== added file 'data/nm-access-point.xml'
--- data/nm-access-point.xml	1970-01-01 00:00:00 +0000
+++ data/nm-access-point.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager.AccessPoint">
+    <property name="Flags" type="u" access="read" tp:type="NM_802_11_AP_FLAGS">
+      <tp:docstring>Flags describing the capabilities of the access point.</tp:docstring>
+    </property>
+    <property name="WpaFlags" type="u" access="read" tp:type="NM_802_11_AP_SEC">
+      <tp:docstring>Flags describing the access point's capabilities according to WPA (Wifi Protected Access).</tp:docstring>
+    </property>
+    <property name="RsnFlags" type="u" access="read" tp:type="NM_802_11_AP_SEC">
+      <tp:docstring>Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.</tp:docstring>
+    </property>
+    <property name="Ssid" type="ay" access="read">
+      <tp:docstring>The Service Set Identifier identifying the access point.</tp:docstring>
+    </property>
+    <property name="Frequency" type="u" access="read">
+      <tp:docstring>The radio channel frequency in use by the access point, in MHz.</tp:docstring>
+    </property>
+    <property name="HwAddress" type="s" access="read">
+      <tp:docstring>The hardware address (BSSID) of the access point.</tp:docstring>
+    </property>
+
+    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
+      <tp:docstring>Describes the operating mode of the access point.</tp:docstring>
+    </property>
+    <property name="MaxBitrate" type="u" access="read">
+      <tp:docstring>The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).</tp:docstring>
+    </property>
+    <property name="Strength" type="y" access="read">
+      <tp:docstring>The current signal quality of the access point, in percent.</tp:docstring>
+    </property>
+
+    <signal name="PropertiesChanged">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+            <tp:docstring>
+                A dictionary mapping property names to variant boxed values
+            </tp:docstring>
+        </arg>
+    </signal>
+    <tp:flags name="NM_802_11_AP_FLAGS" value-prefix="NM_802_11_AP_FLAGS" type="u">
+      <tp:docstring>
+        Flags describing the general capabilities of the access point.
+      </tp:docstring>
+      <tp:flag suffix="NONE" value="0x0">
+        <tp:docstring>Null capability - says nothing about the access point.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="PRIVACY" value="0x1">
+        <tp:docstring>Access point supports privacy measures.</tp:docstring>
+      </tp:flag>
+    </tp:flags>
+    <tp:flags name="NM_802_11_AP_SEC" value-prefix="NM_802_11_AP_SEC" type="u">
+      <tp:docstring>
+        Flags describing the security capabilities of the access point.
+      </tp:docstring>
+      <tp:flag suffix="NONE" value="0x0">
+        <tp:docstring>Null flag.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="PAIR_WEP40" value="0x1">
+        <tp:docstring>Access point supports pairwise 40-bit WEP encryption.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="PAIR_WEP104" value="0x2">
+        <tp:docstring>Access point supports pairwise 104-bit WEP encryption.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="PAIR_TKIP" value="0x4">
+        <tp:docstring>Access point supports pairwise TKIP encryption.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="PAIR_CCMP" value="0x8">
+        <tp:docstring>Access point supports pairwise CCMP encryption.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="GROUP_WEP40" value="0x10">
+        <tp:docstring>Access point supports a group 40-bit WEP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="GROUP_WEP104" value="0x20">
+        <tp:docstring>Access point supports a group 104-bit WEP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="GROUP_TKIP" value="0x40">
+        <tp:docstring>Access point supports a group TKIP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="GROUP_CCMP" value="0x80">
+        <tp:docstring>Access point supports a group CCMP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="KEY_MGMT_PSK" value="0x100">
+        <tp:docstring>Access point supports PSK key management.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="KEY_MGMT_802_1X" value="0x200">
+        <tp:docstring>Access point supports 802.1x key management.</tp:docstring>
+      </tp:flag>
+    </tp:flags>
+  </interface>
+</node>
+

=== added file 'data/nm-active-connection.xml'
--- data/nm-active-connection.xml	1970-01-01 00:00:00 +0000
+++ data/nm-active-connection.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager.Connection.Active">
+    <tp:docstring>
+      Objects that implement the Connection.Active interface represent an attempt
+      to connect to a network using the details provided by a Connection object.
+      The Connection.Active object tracks the life-cycle of the connection
+      attempt and if successful indicates whether the connected network is the
+      "default" or preferred network for access.
+    </tp:docstring>
+
+    <property name="Connection" type="o" access="read">
+      <tp:docstring>
+        The path of the connection.
+      </tp:docstring>
+    </property>
+    <property name="SpecificObject" type="o" access="read">
+      <tp:docstring>
+        A specific object associated with the active connection.  This property
+        reflects the specific object used during connection activation, and will
+        not change over the lifetime of the ActiveConnection once set.
+      </tp:docstring>
+    </property>
+    <property name="Id" type="s" access="read">
+      <tp:docstring>
+        The ID of the connection, provided as a convenience so that clients
+        do not have to retrieve all connection details.
+      </tp:docstring>
+    </property>
+    <property name="Uuid" type="s" access="read">
+      <tp:docstring>
+        The UUID of the connection, provided as a convenience so that clients
+        do not have to retrieve all connection details.
+      </tp:docstring>
+    </property>
+    <property name="Type" type="s" access="read">
+      <tp:docstring>
+        The type of the connection, provided as a convenience so that clients
+        do not have to retrieve all connection details.
+      </tp:docstring>
+    </property>
+    <property name="Devices" type="ao" access="read">
+      <tp:docstring>
+        Array of object paths representing devices which are part of this active
+        connection.
+      </tp:docstring>
+    </property>
+    <property name="State" type="u" access="read" tp:type="NM_ACTIVE_CONNECTION_STATE">
+      <tp:docstring>
+        The state of this active connection.
+      </tp:docstring>
+    </property>
+    <!--property name="Default" type="b" access="read">
+      <tp:docstring>
+        Whether this active connection is the default IPv4 connection, i.e.
+        whether it currently owns the default IPv4 route.
+      </tp:docstring>
+    </property-->
+    <property name="Ip4Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Ip4Config object describing the configuration of the
+        connection. Only valid when the connection is in the
+        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+      </tp:docstring>
+    </property>
+    <property name="Dhcp4Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Dhcp4Config object describing the DHCP options
+        returned by the DHCP server (assuming the connection used DHCP). Only
+        valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+        state.
+      </tp:docstring>
+    </property>
+    <property name="Default6" type="b" access="read">
+      <tp:docstring>
+        Whether this active connection is the default IPv6 connection, i.e.
+        whether it currently owns the default IPv6 route.
+      </tp:docstring>
+    </property>
+    <property name="Ip6Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Ip6Config object describing the configuration of the
+        connection. Only valid when the connection is in the
+        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+      </tp:docstring>
+    </property>
+    <property name="Dhcp6Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Dhcp6Config object describing the DHCP options
+        returned by the DHCP server (assuming the connection used DHCP). Only
+        valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+        state.
+      </tp:docstring>
+    </property>
+    <property name="Vpn" type="b" access="read">
+      <tp:docstring>
+        Whether this active connection is also a VPN connection.
+      </tp:docstring>
+    </property>
+    <property name="Master" type="o" access="read">
+      <tp:docstring>
+        The path to the master device if the connection is a slave.
+      </tp:docstring>
+    </property>
+
+    <signal name="PropertiesChanged">
+        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+            <tp:docstring>
+                A dictionary mapping property names to variant boxed values
+            </tp:docstring>
+        </arg>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+    </signal>
+
+    <tp:enum name="NM_ACTIVE_CONNECTION_STATE" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          The active connection is in an unknown state.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ACTIVATING" value="1">
+        <tp:docstring>
+          The connection is activating.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ACTIVATED" value="2">
+        <tp:docstring>
+          The connection is activated.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DEACTIVATING" value="3">
+        <tp:docstring>
+          The connection is being torn down and cleaned up.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DEACTIVATED" value="4">
+        <tp:docstring>
+          The connection is no longer active.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+  </interface>
+</node>
+

=== added file 'data/nm-device-wifi.xml'
--- data/nm-device-wifi.xml	1970-01-01 00:00:00 +0000
+++ data/nm-device-wifi.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager.Device.Wireless">
+    <method name="GetAccessPoints">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/>
+      <arg name="access_points" type="ao" direction="out">
+        <tp:docstring>
+          List of access point object paths
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        Get the list of access points visible to this device.
+      </tp:docstring>
+    </method>
+
+    <method name="RequestScan">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_request_scan"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+      <arg name="options" type="a{sv}" direction="in">
+        <tp:docstring>
+          Options of scan
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        Request the device to scan
+      </tp:docstring>
+    </method>
+
+    <property name="HwAddress" type="s" access="read">
+      <tp:docstring>
+        The active hardware address of the device.
+      </tp:docstring>
+    </property>
+
+    <property name="PermHwAddress" type="s" access="read">
+      <tp:docstring>
+        The permanent hardware address of the device.
+      </tp:docstring>
+    </property>
+
+    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
+      <tp:docstring>
+        The operating mode of the wireless device.
+      </tp:docstring>
+    </property>
+
+    <property name="Bitrate" type="u" access="read">
+      <tp:docstring>
+        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
+      </tp:docstring>
+    </property>
+    <property name="ActiveAccessPoint" type="o" access="read">
+      <tp:docstring>
+        Object path of the access point currently used by the wireless device.
+      </tp:docstring>
+    </property>
+    <property name="WirelessCapabilities" type="u" access="read" tp:type="NM_802_11_DEVICE_CAP">
+      <tp:docstring>
+        The capabilities of the wireless device.
+      </tp:docstring>
+    </property>
+
+    <signal name="PropertiesChanged">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+            <tp:docstring>
+                A dictionary containing the FIXME: check changed parameters.
+            </tp:docstring>
+        </arg>
+        <tp:docstring>
+            Emitted when the wireless device's properties changed.
+        </tp:docstring>
+    </signal>
+
+    <signal name="AccessPointAdded">
+        <arg name="access_point" type="o">
+            <tp:docstring>
+                The object path of the newly found access point.
+            </tp:docstring>
+        </arg>
+        <tp:docstring>
+            Emitted when a new access point is found by the device.
+        </tp:docstring>
+    </signal>
+
+    <signal name="AccessPointRemoved">
+      <arg name="access_point" type="o">
+            <tp:docstring>
+                The object path of the access point that has disappeared.
+            </tp:docstring>
+        </arg>
+        <tp:docstring>
+            Emitted when an access point disappears from view of the device.
+        </tp:docstring>
+    </signal>
+
+    <tp:flags name="NM_802_11_DEVICE_CAP" type="u">
+      <tp:docstring>
+        Flags describing the capabilities of a wireless device.
+      </tp:docstring>
+      <tp:flag suffix="NONE" value="0x0">
+        <tp:docstring>Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="CIPHER_WEP40" value="0x1">
+        <tp:docstring>The device supports the 40-bit WEP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="CIPHER_WEP104" value="0x2">
+        <tp:docstring>The device supports the 104-bit WEP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="CIPHER_TKIP" value="0x4">
+        <tp:docstring>The device supports the TKIP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="CIPHER_CCMP" value="0x8">
+        <tp:docstring>The device supports the CCMP cipher.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="WPA" value="0x10">
+        <tp:docstring>The device supports the WPA encryption/authentication protocol.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="RSN" value="0x20">
+        <tp:docstring>The device supports the RSN encryption/authentication protocol.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="AP" value="0x40">
+        <tp:docstring>The device supports Access Point mode.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="ADHOC" value="0x80">
+        <tp:docstring>The device supports Ad-Hoc mode.</tp:docstring>
+      </tp:flag>
+    </tp:flags>
+  </interface>
+</node>

=== added file 'data/nm-device.xml'
--- data/nm-device.xml	1970-01-01 00:00:00 +0000
+++ data/nm-device.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,598 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager.Device">
+    <property name="Udi" type="s" access="read">
+      <tp:docstring>
+        Operating-system specific transient device hardware identifier.  This
+        is an opaque string representing the underlying hardware for the device,
+        and shouldn't be used to keep track of individual devices.  For some
+        device types (Bluetooth, Modems) it is an identifier used by the
+        hardware service (ie bluez or ModemManager) to refer to that device,
+        and client programs use it get additional information from those
+        services which NM does not provide.  The Udi is not guaranteed to be
+        consistent across reboots or hotplugs of the hardware. If you're looking
+        for a way to uniquely track each device in your application, use the
+        object path.  If you're looking for a way to track a specific piece of
+        hardware across reboot or hotplug, use a MAC address or USB serial
+        number.
+      </tp:docstring>
+    </property>
+    <property name="Interface" type="s" access="read">
+      <tp:docstring>
+        The name of the device's control (and often data) interface.
+      </tp:docstring>
+    </property>
+    <property name="IpInterface" type="s" access="read">
+      <tp:docstring>
+        The name of the device's data interface when available.  This property
+        may not refer to the actual data interface until the device has
+        successfully established a data connection, indicated by the device's
+        State becoming ACTIVATED.
+      </tp:docstring>
+    </property>
+    <property name="Driver" type="s" access="read">
+      <tp:docstring>
+        The driver handling the device.
+      </tp:docstring>
+    </property>
+    <property name="DriverVersion" type="s" access="read">
+      <tp:docstring>
+        The version of the driver handling the device.
+      </tp:docstring>
+    </property>
+    <property name="FirmwareVersion" type="s" access="read">
+      <tp:docstring>
+        The firmware version for the device.
+      </tp:docstring>
+    </property>
+    <property name="Capabilities" type="u" access="read" tp:type="NM_DEVICE_CAP">
+      <tp:docstring>
+        Flags describing the capabilities of the device.
+      </tp:docstring>
+    </property>
+    <property name="Ip4Address" type="i" access="read">
+      <tp:docstring>
+        The IPv4 address bound to the device. FIXME: what about devices with >1 IP address?
+      </tp:docstring>
+    </property>
+    <property name="State" type="u" access="read" tp:type="NM_DEVICE_STATE">
+      <tp:docstring>
+        The current state of the device.
+      </tp:docstring>
+    </property>
+    <property name="StateReason" type="(uu)" access="read" tp:type="NM_DEVICE_STATE_REASON_STRUCT">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariant"/>
+      <tp:docstring>
+        The current state and reason for changing to that state.
+      </tp:docstring>
+    </property>
+    <property name="ActiveConnection" type="o" access="read">
+      <tp:docstring>
+        Object path of an ActiveConnection object that "owns" this device during
+        activation.  The ActiveConnection object tracks the life-cycle of a
+        connection to a specific network and implements the
+        org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
+      </tp:docstring>
+    </property>
+    <property name="Ip4Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      </tp:docstring>
+    </property>
+    <property name="Dhcp4Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      </tp:docstring>
+    </property>
+    <property name="Ip6Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      </tp:docstring>
+    </property>
+    <property name="Dhcp6Config" type="o" access="read">
+      <tp:docstring>
+        Object path of the Dhcp6Config object describing the DHCP options
+        returned by the DHCP server.  Only valid when the device is in the
+        NM_DEVICE_STATE_ACTIVATED state.
+      </tp:docstring>
+    </property>
+    <property name="Managed" type="b" access="read">
+      <tp:docstring>
+        Whether or not this device is managed by NetworkManager.
+      </tp:docstring>
+    </property>
+    <property name="Autoconnect" type="b" access="readwrite">
+      <tp:docstring>
+        If TRUE, indicates the device is allowed to autoconnect.  If FALSE,
+        manual intervention is required before the device will automatically
+        connect to a known network, such as activating a connection using the
+        device, or setting this property to TRUE.
+      </tp:docstring>
+    </property>
+    <property name="FirmwareMissing" type="b" access="read">
+      <tp:docstring>
+        If TRUE, indicates the device is likely missing firmware necessary for
+        its operation.
+      </tp:docstring>
+    </property>
+    <property name="DeviceType" type="u" access="read" tp:type="NM_DEVICE_TYPE">
+      <tp:docstring>
+        The general type of the network device; ie Ethernet, WiFi, etc.
+      </tp:docstring>
+    </property>
+    <property name="AvailableConnections" type="ao" access="read">
+      <tp:docstring>
+        An array of object paths of every configured connection that is currently 'available' through this device.
+      </tp:docstring>
+    </property>
+
+    <method name="Disconnect">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_disconnect"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <tp:docstring>
+        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
+      </tp:docstring>
+    </method>
+
+    <signal name="StateChanged">
+      <arg name="new_state" type="u" tp:type="NM_DEVICE_STATE">
+        <tp:docstring>
+          The new state of the device.
+        </tp:docstring>
+      </arg>
+      <arg name="old_state" type="u" tp:type="NM_DEVICE_STATE">
+        <tp:docstring>
+          The previous state of the device.
+        </tp:docstring>
+      </arg>
+      <arg name="reason" type="u" tp:type="NM_DEVICE_STATE_REASON">
+        <tp:docstring>
+          A reason for the state transition.
+        </tp:docstring>
+      </arg>
+    </signal>
+
+    <tp:enum name="NM_DEVICE_STATE" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          The device is in an unknown state.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="UNMANAGED" value="10">
+        <tp:docstring>
+          The device is recognized but not managed by NetworkManager.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="UNAVAILABLE" value="20">
+        <tp:docstring>
+          The device cannot be used (carrier off, rfkill, etc).
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DISCONNECTED" value="30">
+        <tp:docstring>
+          The device is not connected.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="PREPARE" value="40">
+        <tp:docstring>
+          The device is preparing to connect.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONFIG" value="50">
+        <tp:docstring>
+          The device is being configured.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="NEED_AUTH" value="60">
+        <tp:docstring>
+          The device is awaiting secrets necessary to continue connection.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="IP_CONFIG" value="70">
+        <tp:docstring>
+          The IP settings of the device are being requested and configured.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="IP_CHECK" value="80">
+        <tp:docstring>
+          The device's IP connectivity ability is being determined.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SECONDARIES" value="90">
+        <tp:docstring>
+          The device is waiting for secondary connections to be activated.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ACTIVATED" value="100">
+        <tp:docstring>
+          The device is active.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DEACTIVATING" value="110">
+        <tp:docstring>
+          The device's network connection is being torn down.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="FAILED" value="120">
+        <tp:docstring>
+          The device is in a failure state following an attempt to activate it.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+    <tp:enum name="NM_DEVICE_TYPE" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          The device type is unknown.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ETHERNET" value="1">
+        <tp:docstring>
+          The device is wired Ethernet device.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="WIFI" value="2">
+        <tp:docstring>
+          The device is an 802.11 WiFi device.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="UNUSED1" value="3">
+        <tp:docstring>Unused</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="UNUSED2" value="4">
+        <tp:docstring>Unused</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="BT" value="5">
+        <tp:docstring>
+          The device is Bluetooth device that provides PAN or DUN capabilities.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="OLPC_MESH" value="6">
+        <tp:docstring>
+          The device is an OLPC mesh networking device.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="WIMAX" value="7">
+        <tp:docstring>
+          The device is an 802.16e Mobile WiMAX device.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM" value="8">
+        <tp:docstring>
+          The device is a modem supporting one or more of analog telephone,
+          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
+          wireline data network.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="INFINIBAND" value="9">
+        <tp:docstring>
+          The device is an IP-capable InfiniBand interface.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="BOND" value="10">
+        <tp:docstring>
+          The device is a bond master interface.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="VLAN" value="11">
+        <tp:docstring>
+          The device is a VLAN interface.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ADSL" value="12">
+        <tp:docstring>
+          The device is an ADSL device supporting PPPoE and PPPoATM protocols.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="BRIDGE" value="13">
+        <tp:docstring>
+          The device is a bridge interface.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+    <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u">
+      <tp:flag suffix="NONE" value="0x0">
+        <tp:docstring>Null capability.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="NM_SUPPORTED" value="0x1">
+        <tp:docstring>The device is supported by NetworkManager.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="CARRIER_DETECT" value="0x2">
+        <tp:docstring>The device supports carrier detection.</tp:docstring>
+      </tp:flag>
+    </tp:flags>
+
+    <tp:enum name="NM_DEVICE_STATE_REASON" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          The reason for the device state change is unknown.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="NONE" value="1">
+        <tp:docstring>
+          The state change is normal.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="NOW_MANAGED" value="2">
+        <tp:docstring>
+          The device is now managed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="NOW_UNMANAGED" value="3">
+        <tp:docstring>
+          The device is no longer managed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONFIG_FAILED" value="4">
+        <tp:docstring>
+          The device could not be readied for configuration.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONFIG_UNAVAILABLE" value="5">
+        <tp:docstring>
+          IP configuration could not be reserved (no available address, timeout, etc).
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONFIG_EXPIRED" value="6">
+        <tp:docstring>
+          The IP configuration is no longer valid.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="NO_SECRETS" value="7">
+        <tp:docstring>
+          Secrets were required, but not provided.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUPPLICANT_DISCONNECT" value="8">
+        <tp:docstring>
+          The 802.1X supplicant disconnected from the access point or authentication server.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUPPLICANT_CONFIG_FAILED" value="9">
+        <tp:docstring>
+          Configuration of the 802.1X supplicant failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUPPLICANT_FAILED" value="10">
+        <tp:docstring>
+          The 802.1X supplicant quit or failed unexpectedly.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUPPLICANT_TIMEOUT" value="11">
+        <tp:docstring>
+          The 802.1X supplicant took too long to authenticate.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="PPP_START_FAILED" value="12">
+        <tp:docstring>
+          The PPP service failed to start within the allowed time.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="PPP_DISCONNECT" value="13">
+        <tp:docstring>
+          The PPP service disconnected unexpectedly.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="PPP_FAILED" value="14">
+        <tp:docstring>
+          The PPP service quit or failed unexpectedly.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DHCP_START_FAILED" value="15">
+        <tp:docstring>
+          The DHCP service failed to start within the allowed time.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DHCP_ERROR" value="16">
+        <tp:docstring>
+          The DHCP service reported an unexpected error.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DHCP_FAILED" value="17">
+        <tp:docstring>
+          The DHCP service quit or failed unexpectedly.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SHARED_START_FAILED" value="18">
+        <tp:docstring>
+          The shared connection service failed to start.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SHARED_FAILED" value="19">
+        <tp:docstring>
+          The shared connection service quit or failed unexpectedly.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="AUTOIP_START_FAILED" value="20">
+        <tp:docstring>
+          The AutoIP service failed to start.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="AUTOIP_ERROR" value="21">
+        <tp:docstring>
+          The AutoIP service reported an unexpected error.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="AUTOIP_FAILED" value="22">
+        <tp:docstring>
+          The AutoIP service quit or failed unexpectedly.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_BUSY" value="23">
+        <tp:docstring>
+          Dialing failed because the line was busy.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_NO_DIAL_TONE" value="24">
+        <tp:docstring>
+          Dialing failed because there was no dial tone.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_NO_CARRIER" value="25">
+        <tp:docstring>
+          Dialing failed because there was carrier.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_DIAL_TIMEOUT" value="26">
+        <tp:docstring>
+          Dialing timed out.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_DIAL_FAILED" value="27">
+        <tp:docstring>
+          Dialing failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_INIT_FAILED" value="28">
+        <tp:docstring>
+          Modem initialization failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_APN_FAILED" value="29">
+        <tp:docstring>
+          Failed to select the specified GSM APN.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_REGISTRATION_NOT_SEARCHING" value="30">
+        <tp:docstring>
+          Not searching for networks.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_REGISTRATION_DENIED" value="31">
+        <tp:docstring>
+          Network registration was denied.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_REGISTRATION_TIMEOUT" value="32">
+        <tp:docstring>
+          Network registration timed out.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_REGISTRATION_FAILED" value="33">
+        <tp:docstring>
+          Failed to register with the requested GSM network.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_PIN_CHECK_FAILED" value="34">
+        <tp:docstring>
+          PIN check failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="FIRMWARE_MISSING" value="35">
+        <tp:docstring>
+          Necessary firmware for the device may be missing.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="REMOVED" value="36">
+        <tp:docstring>
+          The device was removed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SLEEPING" value="37">
+        <tp:docstring>
+          NetworkManager went to sleep.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTION_REMOVED" value="38">
+        <tp:docstring>
+          The device's active connection was removed or disappeared.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="USER_REQUESTED" value="39">
+        <tp:docstring>
+          A user or client requested the disconnection.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CARRIER" value="40">
+        <tp:docstring>
+          The device's carrier/link changed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTION_ASSUMED" value="41">
+        <tp:docstring>
+          The device's existing connection was assumed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUPPLICANT_AVAILABLE" value="42">
+        <tp:docstring>
+          The 802.1x supplicant is now available.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_NOT_FOUND" value="43">
+        <tp:docstring>
+          The modem could not be found.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="BT_FAILED" value="44">
+        <tp:docstring>
+          The Bluetooth connection timed out or failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_NOT_INSERTED" value="45">
+        <tp:docstring>
+          GSM Modem's SIM Card not inserted.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_PIN_REQUIRED" value="46">
+        <tp:docstring>
+          GSM Modem's SIM Pin required.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_PUK_REQUIRED" value="47">
+        <tp:docstring>
+          GSM Modem's SIM Puk required.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_WRONG" value="48">
+        <tp:docstring>
+          GSM Modem's SIM wrong
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="INFINIBAND_MODE" value="49">
+        <tp:docstring>
+          InfiniBand device does not support connected mode.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DEPENDENCY_FAILED" value="50">
+        <tp:docstring>
+          A dependency of the connection failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="BR2684_FAILED" value="51">
+        <tp:docstring>
+          Problem with the RFC 2684 Ethernet over ADSL bridge.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_MANAGER_UNAVAILABLE" value="52">
+        <tp:docstring>
+          ModemManager was not running or quit unexpectedly.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SSID_NOT_FOUND" value="53">
+        <tp:docstring>
+          The 802.11 Wi-Fi network could not be found.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SECONDARY_CONNECTION_FAILED" value="54">
+        <tp:docstring>
+          A secondary connection of the base connection failed.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+    <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT">
+      <tp:member type="u" name="state" tp:type="NM_DEVICE_STATE">
+        <tp:docstring>
+          The device state.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="u" name="reason" tp:type="NM_DEVICE_STATE_REASON">
+        <tp:docstring>
+          The reason for originally changing to the device state.
+        </tp:docstring>
+      </tp:member>
+    </tp:struct>
+  </interface>
+</node>

=== added file 'data/nm-manager.xml'
--- data/nm-manager.xml	1970-01-01 00:00:00 +0000
+++ data/nm-manager.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager">
+    <method name="GetDevices">
+      <tp:docstring>
+        Get the list of network devices.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
+      <arg name="devices" type="ao" direction="out">
+        <tp:docstring>
+          List of object paths of network devices known to the system.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="GetDeviceByIpIface">
+      <tp:docstring>
+        Return the object path of the network device referenced by its IP
+        interface name.  Note that some devices (usually modems) only have an
+        IP interface name when they are connected.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_device_by_ip_iface"/>
+      <arg name="iface" type="s" direction="in">
+        <tp:docstring>
+          Interface name of the device to find.
+        </tp:docstring>
+      </arg>
+      <arg name="device" type="o" direction="out">
+        <tp:docstring>
+          Object path of the network device.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="ActivateConnection">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <tp:docstring>
+        Activate a connection using the supplied device.
+      </tp:docstring>
+      <arg name="connection" type="o" direction="in">
+        <tp:docstring>
+          The connection to activate the devices with.
+        </tp:docstring>
+      </arg>
+      <arg name="device" type="o" direction="in">
+        <tp:docstring>
+          The object path of device to be activated for physical connections.  This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
+        </tp:docstring>
+      </arg>
+      <arg name="specific_object" type="o" direction="in">
+        <tp:docstring>
+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, or "/" to pick and AP automatically.  For VPN connections, pass
+          the object path of an ActiveConnection object that should serve as the
+          "base" connection (to which the VPN connections lifetime will be tied),
+          or pass "/" and NM will automatically use the current default device.
+        </tp:docstring>
+      </arg>
+      <arg name="active_connection" type="o" direction="out">
+        <tp:docstring>
+          The path of the active connection object representing this active connection.
+        </tp:docstring>
+      </arg>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionActivating">
+          <tp:docstring>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</tp:docstring>
+        </tp:error>
+        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
+          <tp:docstring>The connection is invalid for this device.</tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+
+    <method name="AddAndActivateConnection">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_add_and_activate_connection"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantDictMap"/>
+      <tp:docstring>
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+      </tp:docstring>
+      <arg name="connection" type="a{sa{sv}}" direction="in">
+        <tp:docstring>
+          Connection settings and properties; if incomplete missing settings will
+          be automatically completed using the given device and specific object.
+        </tp:docstring>
+      </arg>
+      <arg name="device" type="o" direction="in">
+        <tp:docstring>
+          The object path of device to be activated using the given connection.
+        </tp:docstring>
+      </arg>
+      <arg name="specific_object" type="o" direction="in">
+        <tp:docstring>
+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, which will be used to complete the details of the newly added
+          connection.
+        </tp:docstring>
+      </arg>
+      <arg name="path" type="o" direction="out">
+        <tp:docstring>
+          Object path of the new connection that was just added.
+        </tp:docstring>
+      </arg>
+      <arg name="active_connection" type="o" direction="out">
+        <tp:docstring>
+          The path of the active connection object representing this active connection.
+        </tp:docstring>
+      </arg>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
+          <tp:docstring>The connection is invalid for this device.</tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+
+    <method name="DeactivateConnection">
+      <tp:docstring>
+        Deactivate an active connection.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="active_connection" type="o" direction="in">
+        <tp:docstring>
+          The currently active connection to deactivate.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="Sleep">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <tp:docstring>
+        Control the NetworkManager daemon's sleep state.  When asleep, all
+        interfaces that it manages are deactivated.  When awake, devices are
+        available to be activated.  This command should not be called directly
+        by users or clients; it is intended for system suspend/resume tracking.
+      </tp:docstring>
+      <arg name="sleep" type="b" direction="in">
+        <tp:docstring>
+          Indicates whether the NetworkManager daemon should sleep or wake.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="Enable">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_enable"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <tp:docstring>
+        Control whether overall networking is enabled or disabled.  When
+        disabled, all interfaces that NM manages are deactivated.  When enabled,
+        all managed interfaces are re-enabled and available to be activated.
+        This command should be used by clients that provide to users the ability
+        to enable/disable all networking.
+      </tp:docstring>
+      <arg name="enable" type="b" direction="in">
+        <tp:docstring>
+          If FALSE, indicates that all networking should be disabled.  If TRUE,
+          indicates that NetworkManager should begin managing network devices.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="GetPermissions">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_permissions"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <tp:docstring>
+        Returns the permissions a caller has for various authenticated operations
+        that NetworkManager provides, like Enable/Disable networking, changing
+        WiFi, WWAN, and WiMAX state, etc.
+      </tp:docstring>
+      <arg name="permissions" type="a{ss}" direction="out">
+        <tp:docstring>
+          Dictionary of available permissions and results.  Each permission
+          is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")
+          and each result is one of the following values: "yes" (the permission
+          is available), "auth" (the permission is available after a successful
+          authentication), or "no" (the permission is denied).  Clients may use
+          these values in the UI to indicate the ability to perform certain
+          operations.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <signal name="CheckPermissions">
+      <tp:docstring>
+        Emitted when system authorization details change, indicating that
+        clients may wish to recheck permissions with GetPermissions.
+      </tp:docstring>
+    </signal>
+
+    <method name="SetLogging">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_set_logging"/>
+      <tp:docstring>
+        Set logging verbosity and which operations are logged.
+      </tp:docstring>
+      <arg name="level" type="s" direction="in">
+        <tp:docstring>
+          One of [ERR, WARN, INFO, DEBUG].
+        </tp:docstring>
+      </arg>
+      <arg name="domains" type="s" direction="in">
+        <tp:docstring>
+          A combination of logging domains separated by commas (','), or "NONE"
+          to disable logging.  Each domain enables logging for operations
+          related to that domain.  Available domains are: [HW, RFKILL, ETHER,
+          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
+          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
+          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN].  In addition to
+          these domains, the following special domains can be used: [NONE, ALL,
+          DEFAULT, DHCP, IP].  If an empty string is given, the log level is
+          changed but the current set of log domains remains unchanged.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="GetLogging">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_logging"/>
+      <tp:docstring>
+        Get current logging verbosity level and operations domains.
+      </tp:docstring>
+      <arg name="level" type="s" direction="out">
+        <tp:docstring>
+          One of [ERR, WARN, INFO, DEBUG].
+        </tp:docstring>
+      </arg>
+      <arg name="domains" type="s" direction="out">
+        <tp:docstring>
+          For available domains see SetLogging() call.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="state">
+      <tp:docstring>
+        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under it's management.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_state"/>
+      <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
+    </method>
+
+    <property name="NetworkingEnabled" type="b" access="read">
+      <tp:docstring>
+        Indicates if overall networking is currently enabled or not.  See the
+        Enable() method.
+      </tp:docstring>
+    </property>
+
+    <property name="WirelessEnabled" type="b" access="readwrite">
+      <tp:docstring>
+        Indicates if wireless is currently enabled or not.
+      </tp:docstring>
+    </property>
+
+    <property name="WirelessHardwareEnabled" type="b" access="read">
+      <tp:docstring>
+        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
+      </tp:docstring>
+    </property>
+
+    <property name="WwanEnabled" type="b" access="readwrite">
+      <tp:docstring>
+        Indicates if mobile broadband devices are currently enabled or not.
+      </tp:docstring>
+    </property>
+
+    <property name="WwanHardwareEnabled" type="b" access="read">
+      <tp:docstring>
+        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
+      </tp:docstring>
+    </property>
+
+    <property name="WimaxEnabled" type="b" access="readwrite">
+      <tp:docstring>
+        Indicates if WiMAX devices are currently enabled or not.
+      </tp:docstring>
+    </property>
+
+    <property name="WimaxHardwareEnabled" type="b" access="read">
+      <tp:docstring>
+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
+      </tp:docstring>
+    </property>
+
+    <property name="ActiveConnections" type="ao" access="read">
+      <tp:docstring>
+        List of active connection object paths.
+      </tp:docstring>
+    </property>
+
+    <property name="Version" type="s" access="read">
+      <tp:docstring>
+        NetworkManager version.
+      </tp:docstring>
+    </property>
+
+    <property name="State" type="u" access="read" tp:type="NM_STATE">
+      <tp:docstring>
+        The overall state of the NetworkManager daemon.
+      </tp:docstring>
+    </property>
+
+    <signal name="StateChanged">
+      <tp:docstring>
+        NetworkManager's state changed.
+      </tp:docstring>
+      <arg name="state" type="u" tp:type="NM_STATE">
+        <tp:docstring>
+          The new state of NetworkManager.
+        </tp:docstring>
+      </arg>
+    </signal>
+
+    <signal name="PropertiesChanged">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+      <tp:docstring>
+        NetworkManager's properties changed.
+      </tp:docstring>
+      <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+        <tp:docstring>
+          The changed properties.
+        </tp:docstring>
+      </arg>
+    </signal>
+
+    <signal name="DeviceAdded">
+      <tp:docstring>
+        A device was added to the system
+      </tp:docstring>
+      <arg name="device_path" type="o">
+        <tp:docstring>
+          The object path of the newly added device.
+        </tp:docstring>
+      </arg>
+    </signal>
+
+    <signal name="DeviceRemoved">
+      <tp:docstring>
+        A device was removed from the system, and is no longer available.
+      </tp:docstring>
+      <arg name="device_path" type="o">
+        <tp:docstring>
+          The object path of the device that was just removed.
+        </tp:docstring>
+      </arg>
+    </signal>
+
+    <tp:enum name="NM_STATE" type="u">
+      <tp:docstring>
+        Describes the overall state of the daemon.
+      </tp:docstring>
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          Networking state is unknown.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ASLEEP" value="10">
+        <tp:docstring>
+          Networking is inactive and all devices are disabled.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DISCONNECTED" value="20">
+        <tp:docstring>
+          There is no active network connection.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DISCONNECTING" value="30">
+        <tp:docstring>
+          Network connections are being cleaned up.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTING" value="40">
+        <tp:docstring>
+          A network device is connecting to a network and there is no other
+          available network connection.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTED_LOCAL" value="50">
+        <tp:docstring>
+          A network device is connected, but there is only link-local connectivity.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTED_SITE" value="60">
+        <tp:docstring>
+          A network device is connected, but there is only site-local connectivity.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTED_GLOBAL" value="70">
+        <tp:docstring>
+          A network device is connected, with global network connectivity.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+  </interface>
+</node>

=== added file 'data/nm-settings-connection.xml'
--- data/nm-settings-connection.xml	1970-01-01 00:00:00 +0000
+++ data/nm-settings-connection.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+
+    <interface name="org.freedesktop.NetworkManager.Settings.Connection">
+        <tp:docstring>
+            Represents a single network connection configuration.
+        </tp:docstring>
+
+        <method name="Update">
+          <tp:docstring>
+            Update the connection with new settings and properties (replacing
+            all previous settings and properties) and save the connection to
+            disk.  Secrets may be part of the update request, and will be either
+            stored in persistent storage or sent to a Secret Agent for storage,
+            depending on the flags associated with each secret.
+          </tp:docstring>
+          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_update"/>
+          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantDictMap"/>
+          <arg name="properties" type="a{sa{sv}}" direction="in">
+            <tp:docstring>
+              New connection settings, properties, and (optionally) secrets.
+            </tp:docstring>
+          </arg>
+        </method>
+
+        <method name="UpdateUnsaved">
+          <tp:docstring>
+            Update the connection with new settings and properties (replacing
+            all previous settings and properties) but do not immediately save
+            the connection to disk.  Secrets may be part of the update request
+            and may sent to a Secret Agent for storage, depending on the
+            flags associated with each secret.
+
+            Use the 'Save' method to save these changes to disk. Note
+            that unsaved changes will be lost if the connection is
+            reloaded from disk (either automatically on file change or
+            due to an explicit ReloadConnections call).
+          </tp:docstring>
+          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_update_unsaved"/>
+          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantDictMap"/>
+          <arg name="properties" type="a{sa{sv}}" direction="in">
+            <tp:docstring>
+              New connection settings, properties, and (optionally) secrets.
+            </tp:docstring>
+          </arg>
+        </method>
+
+        <method name="Delete">
+          <tp:docstring>
+            Delete the connection.
+          </tp:docstring>
+          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_delete"/>
+          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+        </method>
+
+        <method name="GetSettings">
+            <tp:docstring>
+                Get the settings maps describing this network configuration.
+                This will never include any secrets required for connection
+                to the network, as those are often protected.  Secrets must
+                be requested separately using the GetSecrets() call.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_get_settings"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantDictMap"/>
+            <arg name="settings" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    The nested settings maps describing this object.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <method name="GetSecrets">
+            <tp:docstring>
+                Get the secrets belonging to this network configuration.  Only
+                secrets from persistent storage or a Secret Agent running in
+                the requestor's session will be returned.  The user will never
+                be prompted for secrets as a result of this request.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_get_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantDictMap"/>
+            <arg name="setting_name" type="s" direction="in">
+                <tp:docstring>
+                    Name of the setting to return secrets for.  If empty, all
+                    all secrets will be returned.
+                </tp:docstring>
+            </arg>
+
+            <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing secrets.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <method name="ClearSecrets">
+          <tp:docstring>
+            Clear the secrets belonging to this network connection profile.
+          </tp:docstring>
+          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_clear_secrets"/>
+          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+        </method>
+
+        <method name="Save">
+            <tp:docstring>
+                Saves a "dirty" connection (that had previously been
+                updated with UpdateUnsaved) to persistent storage.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_save"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+        </method>
+
+        <signal name="Updated">
+            <tp:docstring>
+                Emitted when any settings or permissions change.  When handling
+                this signal, clients should re-read the connection using the
+                GetSettings method to get the changes and to ensure the client
+                still has permission to access the connection.
+            </tp:docstring>
+        </signal>
+
+        <signal name="Removed">
+            <tp:docstring>
+                Emitted when this connection is no longer available.  This
+                happens when the connection is deleted or if it is no longer
+                accessible by any of the system's logged-in users.  After
+                receipt of this signal, the object no longer exists.  Also
+                see the Settings.ConnectionRemoved signal.
+            </tp:docstring>
+        </signal>
+
+        <property name="Unsaved" type="b" access="read">
+            <tp:docstring>
+                If set, indicates that the in-memory state of the
+                connection does not match the on-disk state. This flag
+                will be set when UpdateUnsaved() is called or when any
+                connection details change, and cleared when the connection
+                is saved to disk via Save() or from internal operations.
+            </tp:docstring>
+        </property>
+
+        <signal name="PropertiesChanged">
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+            <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+                <tp:docstring>
+                    A dictionary mapping property names to variant boxed values.
+                </tp:docstring>
+            </arg>
+        </signal>
+
+    </interface>
+
+</node>

=== added file 'data/org.freedesktop.URfkill.Device.xml'
--- data/org.freedesktop.URfkill.Device.xml	1970-01-01 00:00:00 +0000
+++ data/org.freedesktop.URfkill.Device.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE node PUBLIC
+"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <interface name="org.freedesktop.URfkill.Device">
+    <doc:doc>
+      <doc:description>
+        <doc:para>
+          Objects implementing this interface are usually discovered through
+          the <doc:tt>org.freedesktop.URfkill</doc:tt> interface on
+          the <doc:tt>/org/freedesktop/URfkill</doc:tt> object on
+          the D-Bus system bus service with the well-known
+          name <doc:tt>org.freedesktop.URfkill</doc:tt> using
+          the
+          <doc:ref type="method" to="Rfkill.EnumerateDevices">EnumerateDevices</doc:ref>
+          method.
+        </doc:para>
+        <doc:para>
+          <doc:example language="shell" title="simple example">
+            <doc:code>
+$ gdbus call -y \
+             -d org.freedesktop.URfkill \
+             -o /org/freedesktop/URfkill/devices/0 \
+             -m org.freedesktop.DBus.Properties.GetAll \
+             "org.freedesktop.URfkill.Device"
+
+({'index': &lt;uint32 0&gt;, 'type': &lt;uint32 2&gt;, 'name': &lt;'tpacpi_bluetooth_sw'&gt;, 'soft': &lt;true&gt;, 'hard': &lt;true&gt;, 'platform': &lt;true&gt;},)
+            </doc:code>
+          </doc:example>
+        </doc:para>
+      </doc:description>
+    </doc:doc>
+
+    <!-- ************************************************************ -->
+
+    <signal name="Changed">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted when a property of the device is changed.
+          </doc:para>
+          <doc:para>
+	    Note: This signal is deprecated since 0.4.0. Use the standard signal,
+                  PropertiesChanged from org.freedesktop.DBus.Properties instead.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- ************************************************************ -->
+
+    <property name="index" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    The index of the rfkill device
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="type" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    The type of the rfkill device
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>All</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>WLAN</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>2</doc:term><doc:definition>Bluetooth</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>3</doc:term><doc:definition>UWB</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>4</doc:term><doc:definition>WIMAX</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>5</doc:term><doc:definition>WWAN</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>6</doc:term><doc:definition>GPS</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>7</doc:term><doc:definition>FM</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>8</doc:term><doc:definition>NFC</doc:definition>
+            </doc:item>
+          </doc:list>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="name" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    The name of the rfkill device
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="soft" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    Whether the soft block of the device is on or not
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="hard" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    Whether the hard block of the device is on or not
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="platform" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    Whether the device is generated by a platform driver or not
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+  </interface>
+</node>

=== added file 'data/org.freedesktop.URfkill.Killswitch.xml'
--- data/org.freedesktop.URfkill.Killswitch.xml	1970-01-01 00:00:00 +0000
+++ data/org.freedesktop.URfkill.Killswitch.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,78 @@
+<!DOCTYPE node PUBLIC
+"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <interface name="org.freedesktop.URfkill.Killswitch">
+    <doc:doc>
+      <doc:description>
+        <doc:para>
+          Objects implementing this interface represent different types
+          of killswitches and are discovered through the
+          <doc:tt>org.freedesktop.URfkill.Killswitch</doc:tt> interface
+          on the <doc:tt>/org/freedesktop/URfkill/TYPENAME</doc:tt>
+          object on the D-Bus system bus service with the well-known
+          name <doc:tt>org.freedesktop.URfkill</doc:tt>. The TYPENAME
+          could be <doc:tt>"WLAN"</doc:tt>, <doc:tt>"BLUETOOTH"</doc:tt>,
+          <doc:tt>"UWB"</doc:tt>, <doc:tt>"WIMAX"</doc:tt>,
+          <doc:tt>"WWAN"</doc:tt>, <doc:tt>"GPS"</doc:tt>,
+          <doc:tt>"FM"</doc:tt>, or <doc:tt>"NFC"</doc:tt>.
+        </doc:para>
+        <doc:para>
+          <doc:example language="shell" title="simple example">
+            <doc:code>
+$ gdbus call -y \
+             -d org.freedesktop.URfkill \
+             -o /org/freedesktop/URfkill/WLAN \
+             -m org.freedesktop.DBus.Properties.GetAll \
+             "org.freedesktop.URfkill.Killswitch"
+
+({'state': &lt;2&gt;},)
+            </doc:code>
+          </doc:example>
+        </doc:para>
+      </doc:description>
+    </doc:doc>
+
+    <signal name="StateChanged">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted when the state of the killswitch changed.
+          </doc:para>
+          <doc:para>
+	    Note: This signal is deprecated since 0.4.0. Use the standard signal,
+                  PropertiesChanged from org.freedesktop.DBus.Properties instead.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- ************************************************************ -->
+
+    <property name="state" type="i" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    The state of the killswitch
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>-1</doc:term><doc:definition>killswitch is not available.</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>killswitch is unblocked.</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>killswitch is soft-blocked.</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>2</doc:term><doc:definition>killswitch is hard-blocked.</doc:definition>
+            </doc:item>
+          </doc:list>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+  </interface>
+</node>

=== added file 'data/org.freedesktop.URfkill.xml'
--- data/org.freedesktop.URfkill.xml	1970-01-01 00:00:00 +0000
+++ data/org.freedesktop.URfkill.xml	2015-04-01 15:30:55 +0000
@@ -0,0 +1,388 @@
+<!DOCTYPE node PUBLIC
+"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <interface name="org.freedesktop.URfkill">
+    <doc:doc>
+      <doc:description>
+        <doc:para>
+          The urfkill service is available via the system message
+          bus. To access the service, use
+          the <doc:tt>org.freedesktop.URfkill</doc:tt> interface on
+          the <doc:tt>/org/freedesktop/URfkill</doc:tt> object on
+          the D-Bus system bus service with the well-known
+          name <doc:tt>org.freedesktop.URfkill</doc:tt>.
+        </doc:para>
+        <doc:para>
+          <doc:example language="shell" title="simple example">
+            <doc:code>
+$ gdbus call -y \
+             -d org.freedesktop.URfkill \
+             -o /org/freedesktop/URfkill \
+             -m org.freedesktop.URfkill.EnumerateDevices
+
+([objectpath '/org/freedesktop/URfkill/devices/0', '/org/freedesktop/URfkill/devices/1'],)
+            </doc:code>
+          </doc:example>
+        </doc:para>
+      </doc:description>
+    </doc:doc>
+
+    <!-- ************************************************************ -->
+
+    <method name="Block">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="u" name="type" direction="in">
+        <doc:doc><doc:summary>
+	  The type of devices to be blocked/unblocked
+        </doc:summary></doc:doc>
+      </arg>
+      <arg type="b" name="block" direction="in">
+        <doc:doc><doc:summary>
+	  TRUE to block the devices, FALSE to unblock
+        </doc:summary></doc:doc>
+      </arg>
+      <arg type="b" name="ret" direction="out">
+        <doc:doc><doc:summary>
+	  TRUE for success, otherwise FALSE
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Block or unblock the devices belonging to the type.
+            The types are defined as the followings:
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>All</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>WLAN</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>2</doc:term><doc:definition>Bluetooth</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>3</doc:term><doc:definition>UWB</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>4</doc:term><doc:definition>WIMAX</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>5</doc:term><doc:definition>WWAN</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>6</doc:term><doc:definition>GPS</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>7</doc:term><doc:definition>FM</doc:definition>
+            </doc:item>
+          </doc:list>
+          <doc:para>
+	    Note: This method only changes soft block. Hard block is controlled
+	          by BIOS or the hardware and there is no way to change the
+		  state of hard block through kernel functions.
+          </doc:para>
+        </doc:description>
+        <doc:permission>
+          This method is restricted to the active session user.
+        </doc:permission>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <method name="BlockIdx">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="u" name="index" direction="in">
+        <doc:doc><doc:summary>
+	  The index of the device to be blocked/unblocked
+        </doc:summary></doc:doc>
+      </arg>
+      <arg type="b" name="block" direction="in">
+        <doc:doc><doc:summary>
+	  TRUE to block the device, FALSE to unblock
+        </doc:summary></doc:doc>
+      </arg>
+      <arg type="b" name="ret" direction="out">
+        <doc:doc><doc:summary>
+	  TRUE for success, otherwise FALSE
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Block or unblock the device by the index.
+          </doc:para>
+          <doc:para>
+	    Note: This method only changes soft block. Hard block is controlled
+	          by BIOS or the hardware and there is no way to change the
+		  state of hard block through kernel functions.
+          </doc:para>
+        </doc:description>
+        <doc:permission>
+          This method is restricted to the currently active session user.
+        </doc:permission>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <method name="EnumerateDevices">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="ao" name="array" direction="out">
+        <doc:doc><doc:summary>
+	  An array of the object pathes for the devices
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Enumerate all rfkill objects on the system.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <method name="FlightMode">
+      <arg type="b" name="block" direction="in">
+        <doc:doc><doc:summary>
+	  TRUE of flight mode should be enabled, otherwise FALSE
+        </doc:summary></doc:doc>
+      </arg>
+      <arg type="b" name="ret" direction="out">
+        <doc:doc><doc:summary>
+	  TRUE if successful, otherwise FALSE
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Enable or disable flight mode.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <method name="IsFlightMode">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="b" name="is_flight_mode" direction="out">
+        <doc:doc><doc:summary>
+          TRUE if flight mode is enabled, otherwise FALSE
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Get whether flight mode is enabled or not.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <method name="IsInhibited">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="b" name="is_inhibited" direction="out">
+        <doc:doc><doc:summary>
+	  TRUE if the key control is inhibited, otherwise FALSE
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Get whether the rfkill key handling function is inhibited or not.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <method name="Inhibit">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="s" name="reason" direction="in">
+        <doc:doc><doc:summary>
+	  The reason to inhibit the key control
+        </doc:summary></doc:doc>
+      </arg>
+      <arg type="u" name="inhibit_cookie" direction="out">
+        <doc:doc><doc:summary>
+	  The cookie
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Inhibit the rfkill key handling function for the session.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <method name="Uninhibit">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="u" name="inhibit_cookie" direction="in">
+        <doc:doc><doc:summary>
+	  The cookie
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Cancel a previous call to <doc:ref type="method" to="org.freedesktop.URfkill.Inhibit">Inhibit()</doc:ref>
+            identified by the cookie.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+
+    <signal name="DeviceAdded">
+      <arg type="o" name="device" direction="out">
+        <doc:doc><doc:summary>
+	  The object path for the device that was added
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted when a device is added.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- ************************************************************ -->
+
+    <signal name="DeviceRemoved">
+      <arg type="o" name="device" direction="out">
+        <doc:doc><doc:summary>
+	  The object path for the device that was removed
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted when a device is removed.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- ************************************************************ -->
+
+    <signal name="DeviceChanged">
+      <arg type="o" name="device" direction="out">
+        <doc:doc><doc:summary>
+	  The object path for the device that was changed
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted when a device is changed.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- ************************************************************ -->
+
+    <signal name="FlightModeChanged">
+      <arg type="b" name="flight_mode" direction="out">
+        <doc:doc><doc:summary>
+	  TRUE if flight mode has been enabled, otherwise FALSE
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted when flight mode is enabled or disabled.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- ************************************************************ -->
+
+    <signal name="UrfkeyPressed">
+      <arg type="i" name="keycode" direction="out">
+        <doc:doc><doc:summary>
+	  The keycode emitted from the input device
+        </doc:summary></doc:doc>
+      </arg>
+
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Emitted when a rfkill key is pressed. The keycode is defined in
+            &lt;linux/input.h&gt;.
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>237</doc:term><doc:definition>KEY_BLUETOOTH</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>238</doc:term><doc:definition>KEY_WLAN</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>239</doc:term><doc:definition>KEY_UWB</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>246</doc:term><doc:definition>KEY_WIMAX</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>247</doc:term><doc:definition>KEY_RFKILL</doc:definition>
+            </doc:item>
+          </doc:list>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- ************************************************************ -->
+
+    <property name="DaemonVersion" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    The version the running daemon. e.g. 0.2.0
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="KeyControl" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+	    Whether the key control is enabled or not
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+  </interface>
+</node>

=== modified file 'debian/control'
--- debian/control	2014-10-29 19:46:09 +0000
+++ debian/control	2015-04-01 15:30:55 +0000
@@ -9,22 +9,21 @@
                g++-4.9,
                debhelper (>= 9.0.0),
                google-mock (>= 1.6.0+svn437),
-               dbus-test-runner,
-               libdbus-1-dev,
-               libdbus-cpp-dev (>= 4.1.0),
                libglib2.0-dev,
-               libnm-glib-dev (>= 0.9),
-               libnm-util-dev (>= 0.9),
                libnotify-dev,
-               libprocess-cpp-dev,
-               libproperties-cpp-dev,
+#///! TODO: The next line should be removed once all dependancy on qmenumodel is removed
                libqmenumodel-dev,
+               libqofono-dev,
+               libqofono-qt5-0,
+#///! TODO: The next line should be replaced with: libqtdbusmock1-dev (>= 0.3),
                libqtdbusmock1-dev,
                libqtdbustest1-dev,
                liburl-dispatcher1-dev,
+               libunity-api-dev,
                network-manager-dev,
                ofono-dev,
                pkg-config,
+#///! TODO: The next line should be replaced with: python3-dbusmock (>= 0.14),
                python3-dbusmock,
                python3-setuptools,
                qt5-default,
@@ -69,4 +68,3 @@
 Description: Autopilot tests for the network indicator for Ubuntu
  The Indicator-network service is responsible for exporting the system settings
  menu through dbus.  This package contains its autopilot tests.
-

=== added directory 'sniffer'
=== added file 'sniffer/CMakeLists.txt'
--- sniffer/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ sniffer/CMakeLists.txt	2015-04-01 15:30:55 +0000
@@ -0,0 +1,36 @@
+add_executable(i-n-sniffer
+eventprinter.cpp
+eventprinter.h
+i-n-extractor.cpp
+nmaccesspoint.cpp
+nmaccesspoint.h
+nmactiveconnection.cpp
+nmactiveconnection.h
+nmconnsettings.cpp
+nmconnsettings.h
+nmroot.cpp
+nmroot.h
+nmsettings.cpp
+nmsettings.h
+nmwirelessdevice.cpp
+nmwirelessdevice.h
+ofonomodemmodem.cpp
+ofonomodemmodem.h
+ofonomodemnetworkregistration.cpp
+ofonomodemnetworkregistration.h
+ofonomodemsimmanager.cpp
+ofonomodemsimmanager.h
+ofonoroot.cpp
+ofonoroot.h
+urfkillroot.cpp
+urfkillroot.h
+urfkillswitch.cpp
+urfkillswitch.h
+)
+
+qt5_use_modules(i-n-sniffer Core DBus)
+
+install(
+  TARGETS i-n-sniffer
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

=== added file 'sniffer/eventprinter.h'
--- sniffer/eventprinter.h	1970-01-01 00:00:00 +0000
+++ sniffer/eventprinter.h	2015-04-01 15:30:55 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Authors:
+ *     Jussi Pakkanen <[e-mail]>
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QDBusVariant>
+
+class UrfkillRoot;
+class UrfkillSwitch;
+class NetworkManagerRoot;
+class OfonoModemModem;
+class OfonoModemSimManager;
+class OfonoModemNetworkRegistration;
+
+class EventPrinter : QObject {
+    Q_OBJECT
+
+public:
+    explicit EventPrinter(QObject *parent = nullptr);
+    ~EventPrinter();
+
+public Q_SLOTS:
+    void flightModeChanged(bool new_mode);
+    void btKillswitchChanged();
+    void wlanKillswitchChanged();
+    void nmStateChanged(uint new_state);
+    void nmPropertiesChanged(const QVariantMap &props);
+    void modem1PropertyChanged(const QString name, const QDBusVariant value);
+    void modem2PropertyChanged(const QString name, const QDBusVariant value);
+    void simman1PropertyChanged(const QString name, const QDBusVariant value);
+    void simman2PropertyChanged(const QString name, const QDBusVariant value);
+    void netreg1PropertyChanged(const QString name, const QDBusVariant value);
+    void netreg2PropertyChanged(const QString name, const QDBusVariant value);
+
+private:
+
+    void modemPropertyChanged(const int modem, const QString &name, const QDBusVariant &value);
+    void simmanPropertyChanged(const int simman, const QString &name, const QDBusVariant &value);
+    void netregPropertyChanged(const int modem, const QString &name, const QDBusVariant &value);
+    void activeConnectionsChanged(const QVariant &list);
+    void primaryConnectionTypeChanged(const QString &type);
+
+    UrfkillRoot *urfkill;
+    UrfkillSwitch *btkill;
+    UrfkillSwitch *wlankill;
+    NetworkManagerRoot *nmroot;
+    OfonoModemModem *modem1;
+    OfonoModemModem *modem2;
+    OfonoModemSimManager *simman1;
+    OfonoModemSimManager *simman2;
+    OfonoModemNetworkRegistration *netreg1;
+    OfonoModemNetworkRegistration *netreg2;
+};

=== added file 'sniffer/i-n-extractor.cpp'
--- sniffer/i-n-extractor.cpp	1970-01-01 00:00:00 +0000
+++ sniffer/i-n-extractor.cpp	2015-04-01 15:30:55 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Authors:
+ *     Jussi Pakkanen <[e-mail]>
+ */
+
+
+#include <QCoreApplication>
+
+#include "dbusdata.h"
+#include "eventprinter.h"
+#include "nmaccesspoint.h"
+#include "nmactiveconnection.h"
+#include "nmconnsettings.h"
+#include "nmroot.h"
+#include "nmsettings.h"
+#include "nmwirelessdevice.h"
+#include "ofonomodemnetworkregistration.h"
+#include "ofonomodemsimmanager.h"
+#include "ofonoroot.h"
+#include "urfkillroot.h"
+#include "urfkillswitch.h"
+
+static std::map<const int, const char*> nm_active_connection_strings = {{0, "Unknown"}, {1, "Activating"},
+        {2, "Activated"}, {3, "Deactivating"}, {4, "Deactivated"}};
+static std::map<const int, const char*> nm_connectivity_strings = {{0, "Unknown"}, {1, "None"}, {2, "Portal"},
+        {3, "Limited"}, {4, "Full"}};
+static std::map<const int, const char*> nm_state_strings = {{0, "Unknown"}, {10, "Asleep"}, {20, "Disconnected"},
+    {30, "Disconnecting"}, {40, "Connecting"}, {50, "Connected local"}, {60, "Connected site"}, {70, "Connected global"}};
+static std::map<const int, const char*> nm_ap_mode_strings = {{0, "Unknown"}, {1, "Adhoc"}, {2, "Infra"}, {3, "Access point"}};
+
+void print_nm_wlans(NetworkManagerRoot *nmroot) {
+    auto paths = nmroot->activeConnections();
+    for(const auto &path : paths) {
+        NetworkManagerActiveConnection ac(NM_SERVICE, path.path(), QDBusConnection::systemBus(), nullptr);
+        auto devices = ac.devices();
+        // FIXME, should check all but most connections only have one.
+        NetworkManagerWirelessDevice dev(NM_SERVICE, devices[0].path(), QDBusConnection::systemBus(), nullptr);
+        auto reply = dev.GetAccessPoints();
+        reply.waitForFinished();
+        if(reply.isValid()) {
+            // FIXME and the same here.
+            // FIXME also that active access point might not exist
+            NetworkManagerAccessPoint ap(NM_SERVICE, dev.activeAccessPoint().path(), QDBusConnection::systemBus(), nullptr);
+            printf("Connection %s:\n", path.path().toUtf8().data());
+            auto raw_ssid = ap.ssid();
+            std::string ssid(raw_ssid.cbegin(), raw_ssid.cend());
+            printf("  ssid: %s\n", ssid.c_str());
+            printf("  mode: %d (%s)\n", ap.mode(), nm_ap_mode_strings[ap.mode()]);
+            printf("  visible networks:\n");
+            for(const auto &c : reply.value()) {
+                NetworkManagerAccessPoint i(NM_SERVICE, c.path(), QDBusConnection::systemBus(), nullptr);
+                auto i_raw_ssid = i.ssid();
+                std::string i_ssid(i_raw_ssid.cbegin(), i_raw_ssid.cend());
+                printf("    %s %d\n", i_ssid.c_str(), (int)i.strength());
+            }
+        } else {
+            printf("Connection %s is not wireless.\n", path.path().toUtf8().data());
+        }
+    }
+}
+
+void print_info(QCoreApplication &app) {
+    UrfkillRoot *urfkill = new UrfkillRoot(URFKILL_SERVICE, URFKILL_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    UrfkillSwitch *urfkillwlan = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_WLAN_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    UrfkillSwitch *urfkillbt = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_BLUETOOTH_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    UrfkillSwitch *urfkillgps = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_GPS_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    NetworkManagerRoot *nmroot = new NetworkManagerRoot(NM_SERVICE, NM_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    OfonoRoot *ofonoroot = new OfonoRoot(OFONO_SERVICE, OFONO_OBJECT,
+            QDBusConnection::systemBus(), &app);
+
+    printf("Urfkill flightmode: %d\n", urfkill->IsFlightMode().value());
+    printf("Urfkill WLAN killswitch: %d\n", urfkillwlan->state());
+    printf("Urfkill BLUETOOTH killswitch: %d\n", urfkillbt->state());
+    printf("Urfkill GPS killswitch: %d\n", urfkillgps->state());
+    printf("\n");
+    auto nm_connectivity = nmroot->connectivity();
+    printf("NetworkManager connectivity: %d (%s)\n", nm_connectivity, nm_connectivity_strings[nm_connectivity]);
+    auto nm_state = nmroot->state().value();
+    printf("NetworkManager state: %d (%s).\n", nm_state, nm_state_strings[nm_state]);
+    printf("NetworkManager networking enabled: %d\n", nmroot->networkingEnabled());
+    printf("NetworkManager wireless enabled: %d\n", nmroot->wirelessEnabled());
+    printf("NetworkManager wireless hardware enabled: %d\n", nmroot->wirelessHardwareEnabled());
+    print_nm_wlans(nmroot);
+    printf("\n");
+    auto modems = ofonoroot->GetModems().value();
+    printf("Ofono modem count: %d\n", modems.size());
+    for(const auto &m : modems) {
+        OfonoModemSimManager man(OFONO_SERVICE, m.first.path(), QDBusConnection::systemBus(), nullptr);
+        OfonoModemNetworkRegistration netreg(OFONO_SERVICE, m.first.path(), QDBusConnection::systemBus(), nullptr);
+        auto mprops = man.GetProperties().value();
+        auto regprops = netreg.GetProperties().value();
+
+        const auto &props = m.second;
+        printf("Modem %s:\n", m.first.path().toUtf8().data());
+        // For proper usage should check for existance before indexing.
+        printf(" Powered: %d\n", props["Powered"].toBool());
+        printf(" Online: %d\n", props["Online"].toBool());
+        printf(" Model: %s\n", props["Model"].toString().toUtf8().data());
+        printf(" Manufacturer: %s\n", props["Manufacturer"].toString().toUtf8().data());
+        printf(" Pin required: %s\n", mprops["PinRequired"].toString().toUtf8().data());
+        printf(" Status: %s\n", regprops["Status"].toString().toUtf8().data());
+        printf(" Strength: %d\n", regprops["Strength"].toInt());
+        printf(" Operator: %s\n", regprops["Name"].toString().toUtf8().data());
+    }
+}
+
+int run_daemon(QCoreApplication &app) {
+    new EventPrinter(&app);
+    return app.exec();
+}
+
+int main(int argc, char **argv) {
+    QCoreApplication app(argc, argv);
+    qRegisterMetaType<QVariantDictMap>("QVariantDictMap");
+    qDBusRegisterMetaType<QVariantDictMap>();
+    qRegisterMetaType<ModemPropertyList>("ModemPropertyList");
+    qDBusRegisterMetaType<ModemPropertyList>();
+    qDBusRegisterMetaType<QPair<QDBusObjectPath, QVariantMap>>();
+
+    if(argc == 1) {
+        print_info(app);
+    } else if(argc == 2) {
+        static const std::string arg("-d"); // For daemon mode. Feel free to change to something saner.
+        if(argv[1] == arg)
+            return run_daemon(app);
+        printf("Unknown argument.\n");
+        return 1;
+    } else {
+        printf("Too many arguments.\n");
+        return 1;
+    }
+    return 0;
+}

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-02-16 18:34:37 +0000
+++ src/CMakeLists.txt	2015-04-01 15:30:55 +0000
@@ -3,10 +3,11 @@
     set(COMMON_FLAGS "${COMMON_FLAGS} -Werror")
 endif()
 
-add_subdirectory(dbus-cpp)
-add_subdirectory(connectivity-cpp)
+#add_subdirectory(dbus-cpp)
+#add_subdirectory(connectivity-cpp)
 add_subdirectory(indicator)
 add_subdirectory(menumodel-cpp)
+add_subdirectory(qdbus-stubs)
 add_subdirectory(notify-cpp)
 add_subdirectory(secret-agent)
 add_subdirectory(url-dispatcher-cpp)

=== modified file 'src/connectivity-cpp/CMakeLists.txt'
--- src/connectivity-cpp/CMakeLists.txt	2014-08-19 21:13:53 +0000
+++ src/connectivity-cpp/CMakeLists.txt	2015-04-01 15:30:55 +0000
@@ -3,13 +3,11 @@
 set(CONNECTIVITY_CPP_VERSION_MINOR 0)
 set(CONNECTIVITY_CPP_VERSION_PATCH 1)
 
-include(CTest)
-
-find_package(PkgConfig REQUIRED)
-
-include_directories(include)
-include_directories(dbus-cpp)
-
+include_directories(
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/backend"
+    "${CMAKE_CURRENT_BINARY_DIR}/backend"
+)
 pkg_check_modules(
     PROPERTIESCPP REQUIRED
     properties-cpp
@@ -45,15 +43,7 @@
 )
 add_custom_target(QtCreatorHeaderHack SOURCES ${CONNECTIVITY_INTERFACES})
 
-# list these here to have them visible in Qt Creator
-set(DBUS_INTERFACES
-    dbus-cpp/services/nm.h
-    dbus-cpp/services/ofono.h
-    dbus-cpp/services/urfkill.h
-)
-add_custom_target(QtCreatorHeaderHack2 SOURCES ${DBUS_INTERFACES})
-
 add_subdirectory(data)
 #add_subdirectory(doc)
-add_subdirectory(examples)
+#add_subdirectory(examples)
 add_subdirectory(src)

=== removed directory 'src/connectivity-cpp/dbus-cpp'
=== removed directory 'src/connectivity-cpp/dbus-cpp/services'
=== removed file 'src/connectivity-cpp/dbus-cpp/services/nm.h'
--- src/connectivity-cpp/dbus-cpp/services/nm.h	2014-10-31 13:50:05 +0000
+++ src/connectivity-cpp/dbus-cpp/services/nm.h	1970-01-01 00:00:00 +0000
@@ -1,979 +0,0 @@
-/*
- * Copyright © 2012-2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Antti Kaijanmäki <[e-mail]>
- */
-#ifndef PLATFORM_MANAGER_NMOFONO_NM_H
-#define PLATFORM_MANAGER_NMOFONO_NM_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/any.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-#include <NetworkManager/NetworkManager.h>
-#include "util.h"
-
-namespace org
-{
-namespace freedesktop
-{
-namespace NetworkManager
-{
-    struct Interface {
-
-        struct AccessPoint
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE_ACCESS_POINT};
-                return s;
-            }
-
-            struct Property {
-                struct Frequency
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Frequency"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Flags
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Flags"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct WpaFlags
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"WpaFlags"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct RsnFlags
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"RsnFlags"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Mode
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Mode"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Ssid
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Ssid"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    /// @todo bug tvoss.. D-Bus BYTE(y) should be unsigned
-                    typedef std::vector<std::int8_t> ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct HwAddress
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"HwAddress"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::string ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Strength
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Strength"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::int8_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-            };
-
-            struct Signal {
-                struct PropertiesChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"PropertiesChanged"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-                };
-            };
-
-            AccessPoint(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  frequency(object->get_property<Property::Frequency>()),
-                  hw_address(object->get_property<Property::HwAddress>()),
-                  strength(object->get_property<Property::Strength>()),
-                  flags(object->get_property<Property::Flags>()),
-                  wpa_flags(object->get_property<Property::WpaFlags>()),
-                  rsn_flags(object->get_property<Property::RsnFlags>()),
-                  mode(object->get_property<Property::Mode>()),
-                  ssid(object->get_property<Property::Ssid>()),
-                  properties_changed(object->get_signal<Signal::PropertiesChanged>())
-
-            {}
-
-            std::shared_ptr<core::dbus::Object> object;
-            std::shared_ptr<core::dbus::Property<Property::Frequency>> frequency;
-            std::shared_ptr<core::dbus::Property<Property::HwAddress>> hw_address;
-            std::shared_ptr<core::dbus::Property<Property::Strength>> strength;
-            std::shared_ptr<core::dbus::Property<Property::Flags>> flags;
-            std::shared_ptr<core::dbus::Property<Property::WpaFlags>> wpa_flags;
-            std::shared_ptr<core::dbus::Property<Property::RsnFlags>> rsn_flags;
-            std::shared_ptr<core::dbus::Property<Property::Mode>> mode;
-            std::shared_ptr<core::dbus::Property<Property::Ssid>> ssid;
-            std::shared_ptr<core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>> properties_changed;
-        }; // Interface::AccessPoint
-
-
-        struct ActiveConnection
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE_ACTIVE_CONNECTION};
-                return s;
-            }
-
-            struct Property {
-                struct Connection
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Connection"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct SpecificObject
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"SpecificObject"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Uuid
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Uuid"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::string ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Devices
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Devices"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::vector<core::dbus::types::ObjectPath> ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct State
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"State"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Default
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Default"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Default6
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Default6"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Vpn
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Vpn"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Master
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Master"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-            }; // struct Property
-
-            struct Signal {
-                struct PropertiesChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"PropertiesChanged"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-                };
-            };
-
-            enum class State
-            {
-                unknown      = NM_ACTIVE_CONNECTION_STATE_UNKNOWN,
-                activating   = NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
-                activated    = NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
-                deactivating = NM_ACTIVE_CONNECTION_STATE_DEACTIVATING,
-                deactivated  = NM_ACTIVE_CONNECTION_STATE_DEACTIVATED
-            };
-
-            ActiveConnection(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  connection(object->get_property<Property::Connection>()),
-                  specific_object(object->get_property<Property::SpecificObject>()),
-                  uuid(object->get_property<Property::Uuid>()),
-                  devices(object->get_property<Property::Devices>()),
-                  state(object->get_property<Property::State>()),
-                  default_ipv4(object->get_property<Property::Default>()),
-                  default_ipv6(object->get_property<Property::Default6>()),
-                  vpn(object->get_property<Property::Vpn>()),
-                  master(object->get_property<Property::Master>()),
-                  properties_changed(object->get_signal<Signal::PropertiesChanged>())
-            {
-                token = properties_changed->connect([this](const Signal::PropertiesChanged::ArgumentType &map){
-                    for (auto entry: map) {
-                        if (entry.first == "State") {
-#if 0
-                            std::uint32_t new_value = entry.second.as<std::uint32_t>();
-                            state->update([&new_value](std::uint32_t &current_value){
-                                if (new_value == current_value)
-                                    return false;
-                                current_value = new_value;
-                                return true;
-                            });
-#endif
-                            continue;
-                        }
-                        else {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-                            std::cout << "Unexpected Connection.Active update: " << entry.first << std::endl;
-#endif
-                        }
-                    }
-                });
-            }
-            ~ActiveConnection()
-            {
-                /// @todo fix dbus-cpp...
-                //properties_changed->disconnect(token);
-            }
-
-            State get_state() { return static_cast<State>(state->get()); }
-
-            std::shared_ptr<core::dbus::Object> object;
-            std::shared_ptr<core::dbus::Property<Property::Connection>> connection;
-            std::shared_ptr<core::dbus::Property<Property::SpecificObject>> specific_object;
-            std::shared_ptr<core::dbus::Property<Property::Uuid>> uuid;
-            std::shared_ptr<core::dbus::Property<Property::Devices>> devices;
-            std::shared_ptr<core::dbus::Property<Property::State>> state;
-            std::shared_ptr<core::dbus::Property<Property::Default>> default_ipv4;
-            std::shared_ptr<core::dbus::Property<Property::Default6>> default_ipv6;
-            std::shared_ptr<core::dbus::Property<Property::Vpn>> vpn;
-            std::shared_ptr<core::dbus::Property<Property::Master>> master;
-
-        private:
-            std::shared_ptr<core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>> properties_changed;
-            core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>::SubscriptionToken token;
-        };  // Interface::ActiveConnection
-
-        struct Connection
-        {
-            std::shared_ptr<core::dbus::Object> object;
-
-            Connection(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object)
-            {}
-
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_IFACE_SETTINGS_CONNECTION};
-                return s;
-            }
-
-            struct Method {
-                struct GetSettings
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"GetSettings"};
-                        return s;
-                    }
-
-                    typedef Connection Interface;
-                    typedef std::map<std::string, std::map<std::string, core::dbus::types::Variant>> ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{30};
-                    }
-                };
-            };
-
-            Method::GetSettings::ResultType
-            get_settings()
-            {
-
-                auto result = object->invoke_method_synchronously<Method::GetSettings, Method::GetSettings::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                return result.value();
-            }
-        }; // Interface::Connection
-
-        struct Device
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE_DEVICE};
-                return s;
-            }
-
-            enum class Type
-            {
-                unknown     = NM_DEVICE_TYPE_UNKNOWN,
-                ethernet    = NM_DEVICE_TYPE_ETHERNET,
-                wifi        = NM_DEVICE_TYPE_WIFI,
-                unused_1    = NM_DEVICE_TYPE_UNUSED1,
-                unused_2    = NM_DEVICE_TYPE_UNUSED2,
-                bluetooth   = NM_DEVICE_TYPE_BT,
-                olpc_mesh   = NM_DEVICE_TYPE_OLPC_MESH,
-                wimax       = NM_DEVICE_TYPE_WIMAX,
-                modem       = NM_DEVICE_TYPE_MODEM,
-                infiniband  = NM_DEVICE_TYPE_INFINIBAND,
-                bond        = NM_DEVICE_TYPE_BOND,
-                vlan        = NM_DEVICE_TYPE_VLAN,
-                adsl        = NM_DEVICE_TYPE_ADSL,
-                bridge      = NM_DEVICE_TYPE_BRIDGE
-            };
-
-            struct Wireless
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{NM_DBUS_INTERFACE_DEVICE_WIRELESS};
-                    return s;
-                }
-
-                struct Method {
-                    struct GetAccessPoints
-                    {
-                        static const std::string& name()
-                        {
-                            static const std::string s{"GetAccessPoints"};
-                            return s;
-                        }
-
-                        typedef Wireless Interface;
-                        typedef std::vector<core::dbus::types::ObjectPath> ResultType;
-
-                        static std::chrono::milliseconds default_timeout()
-                        {
-                            return std::chrono::seconds{30};
-                        }
-                    };
-                };
-
-                struct Signal {
-                    struct AccessPointAdded
-                    {
-                        static const std::string& name()
-                        {
-                            static const std::string s{"AccessPointAdded"};
-                            return s;
-                        }
-
-                        typedef Wireless Interface;
-                        typedef core::dbus::types::ObjectPath ArgumentType;
-                    };
-
-                    struct AccessPointRemoved
-                    {
-                        static const std::string& name()
-                        {
-                            static const std::string s{"AccessPointRemoved"};
-                            return s;
-                        }
-
-                        typedef Wireless Interface;
-                        typedef core::dbus::types::ObjectPath ArgumentType;
-                    };
-                };
-
-                Wireless(std::shared_ptr<core::dbus::Object> &base)
-                    : access_point_added(base->get_signal<Signal::AccessPointAdded>()),
-                      access_point_removed(base->get_signal<Signal::AccessPointRemoved>())
-                {}
-
-                std::shared_ptr<core::dbus::Signal<Signal::AccessPointAdded, Signal::AccessPointAdded::ArgumentType>> access_point_added;
-                std::shared_ptr<core::dbus::Signal<Signal::AccessPointRemoved, Signal::AccessPointRemoved::ArgumentType>> access_point_removed;
-
-            }; // Interface::Device::Wireless
-
-            struct Property {
-                struct DeviceType
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"DeviceType"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct DeviceInterface {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Interface"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::string ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Autoconnect
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Autoconnect"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = true;
-                };
-
-                struct State {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"State"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct AvailableConnections {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"AvailableConnections"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::vector<core::dbus::types::ObjectPath> ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct ActiveConnection {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"ActiveConnection"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-            };
-
-            std::vector<Connection>
-            get_available_connections() {
-                std::vector<Connection> list;
-                for (auto c: available_connections->get()) {
-                    list.push_back(Connection(service->object_for_path(c)));
-                }
-                return list;
-            }
-
-            struct Method {
-
-                struct Disconnect
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Disconnect"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef void ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{30};
-                    }
-                };
-            };
-
-            void disconnect()
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Device::Method::Disconnect, Device::Method::Disconnect::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-            }
-
-            struct Signal {
-                struct StateChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"StateChanged"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::tuple<std::uint32_t, std::uint32_t, std::uint32_t> ArgumentType;
-                };
-            };
-
-
-            Type type() const
-            {
-                return static_cast<Type>(device_type->get());
-            }
-
-            std::string interface() const
-            {
-                return device_interface->get();
-            }
-
-            Wireless::Method::GetAccessPoints::ResultType get_access_points() const
-            {
-                auto result = object->invoke_method_synchronously<Wireless::Method::GetAccessPoints,
-                                                                  Wireless::Method::GetAccessPoints::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                return result.value();
-            }
-
-            Device(const std::shared_ptr<core::dbus::Service>& service,
-                   const std::shared_ptr<core::dbus::Object>& object)
-                : service(service),
-                  object(object),
-                  device_type(object->get_property<Property::DeviceType>()),
-                  autoconnect(object->get_property<Property::Autoconnect>()),
-                  device_interface(object->get_property<Property::DeviceInterface>()),
-                  state(object->get_property<Property::State>()),
-                  state_changed(object->get_signal<Signal::StateChanged>()),
-                  available_connections(object->get_property<Property::AvailableConnections>()),
-                  active_connection(object->get_property<Property::ActiveConnection>())
-            {}
-
-            std::shared_ptr<core::dbus::Service> service;
-            std::shared_ptr<core::dbus::Object> object;
-            std::shared_ptr<core::dbus::Property<Property::DeviceType>> device_type;
-            std::shared_ptr<core::dbus::Property<Property::Autoconnect>> autoconnect;
-            std::shared_ptr<core::dbus::Property<Property::DeviceInterface>> device_interface;
-            std::shared_ptr<core::dbus::Property<Property::State>> state;
-            std::shared_ptr<core::dbus::Signal<Signal::StateChanged, Signal::StateChanged::ArgumentType>> state_changed;
-            std::shared_ptr<core::dbus::Property<Property::AvailableConnections>> available_connections;
-            std::shared_ptr<core::dbus::Property<Property::ActiveConnection>> active_connection;
-        }; // Interface::Device
-
-        struct NetworkManager
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE};
-                return s;
-            }
-
-            struct Method {
-                struct ActivateConnection
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"ActivateConnection"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{30};
-                    }
-                };
-
-                struct AddAndActivateConnection
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"AddAndActivateConnection"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::tuple<core::dbus::types::ObjectPath, core::dbus::types::ObjectPath> ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{30};
-                    }
-                };
-
-                struct GetDevices
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"GetDevices"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::vector<core::dbus::types::ObjectPath> ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{30};
-                    }
-                };
-
-            };
-
-
-            struct Property
-            {
-                struct WirelessEnabled {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"WirelessEnabled"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = true;
-                };
-
-                struct State {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"State"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct PrimaryConnection {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"PrimaryConnection"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-            };
-
-            struct Signal {
-
-                struct PropertiesChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"PropertiesChanged"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-                };
-
-                struct DeviceAdded
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"DeviceAdded"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ArgumentType;
-                };
-
-                struct DeviceRemoved
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"DeviceRemoved"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ArgumentType;
-                };
-            };
-
-            Method::ActivateConnection::ResultType
-            activate_connection(const core::dbus::types::ObjectPath &connection,
-                                const core::dbus::types::ObjectPath &device,
-                                const core::dbus::types::ObjectPath &specific_object)
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Method::ActivateConnection,
-                            Method::ActivateConnection::ResultType>
-                        (connection, device, specific_object);
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                return result.value();
-            }
-
-            Method::AddAndActivateConnection::ResultType
-            add_and_activate_connection(std::map<std::string, std::map<std::string, core::dbus::types::Variant>> &connection,
-                                        const core::dbus::types::ObjectPath &device,
-                                        const core::dbus::types::ObjectPath &specific_object)
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Method::AddAndActivateConnection,
-                            Method::AddAndActivateConnection::ResultType>
-                        (connection, device, specific_object);
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-
-                /// @todo return the settings (std::get<0>) object at some point
-                return result.value();
-            }
-
-            std::vector<core::dbus::types::ObjectPath> get_devices()
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Method::GetDevices,
-                            Method::GetDevices::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                return result.value();
-            }
-
-            NetworkManager(std::shared_ptr<core::dbus::Service> &service,
-                           std::shared_ptr<core::dbus::Object> &object)
-                : service(service),
-                  object(object),
-                  wireless_enabled(object->get_property<Property::WirelessEnabled>()),
-                  state(object->get_property<Property::State>()),
-                  properties_changed(object->get_signal<Signal::PropertiesChanged>()),
-                  primary_connection(object->get_property<Property::PrimaryConnection>()),
-                  device_added(object->get_signal<Signal::DeviceAdded>()),
-                  device_removed(object->get_signal<Signal::DeviceRemoved>())
-            {
-            }
-
-            std::shared_ptr<core::dbus::Service> service;
-            std::shared_ptr<core::dbus::Object> object;
-
-            std::shared_ptr<core::dbus::Property<Property::WirelessEnabled>> wireless_enabled;
-            std::shared_ptr<core::dbus::Property<Property::State>> state;
-            std::shared_ptr<core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>> properties_changed;
-            std::shared_ptr<core::dbus::Property<Property::PrimaryConnection>> primary_connection;
-            std::shared_ptr<core::dbus::Signal<Signal::DeviceAdded, Signal::DeviceAdded::ArgumentType>> device_added;
-            std::shared_ptr<core::dbus::Signal<Signal::DeviceRemoved, Signal::DeviceRemoved::ArgumentType>> device_removed;
-        }; // Interface::NetworkManager
-    };
-
-    struct Service
-    {
-        std::shared_ptr<Interface::NetworkManager> nm;
-
-        Service(const core::dbus::Bus::Ptr& bus)
-        {
-            auto service = core::dbus::Service::use_service<Interface::NetworkManager>(bus);
-            auto object = service->object_for_path(core::dbus::types::ObjectPath(NM_DBUS_PATH));
-            nm = std::make_shared<Interface::NetworkManager>(service, object);
-        }
-
-        struct Mock
-        {
-            std::shared_ptr<Interface::NetworkManager> nm;
-
-            Mock(const core::dbus::Bus::Ptr& bus)
-            {
-                auto service = core::dbus::Service::add_service<Interface::NetworkManager>(bus);
-                auto object = service->add_object_for_path(core::dbus::types::ObjectPath(NM_DBUS_PATH));
-                nm = std::make_shared<Interface::NetworkManager>(service, object);
-            }
-        };
-    };
-}
-}
-}
-
-#endif // PLATFORM_MANAGER_NMOFONO_NM_H

=== removed file 'src/connectivity-cpp/dbus-cpp/services/ofono.h'
--- src/connectivity-cpp/dbus-cpp/services/ofono.h	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/dbus-cpp/services/ofono.h	1970-01-01 00:00:00 +0000
@@ -1,339 +0,0 @@
-/*
- * Copyright © 2012-2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_LOCATION_CONNECTIVITY_OFONO_H
-#define LOCATION_SERVICE_LOCATION_CONNECTIVITY_OFONO_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-#include<com/ubuntu/connectivity/util.h>
-
-namespace org
-{
-struct Ofono
-{
-static const std::string& name()
-{
-    static const std::string s{"org.ofono"};
-    return s;
-}
-struct Manager
-{
-    static const std::string& name()
-    {
-        static const std::string s{"org.ofono.Manager"};
-        return s;
-    }
-
-    struct GetModems
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"GetModems"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::vector<
-            core::dbus::types::Struct<
-                core::dbus::types::ObjectPath
-            >
-        > ResultType;
-
-        static std::chrono::milliseconds default_timeout()
-        {
-            return std::chrono::seconds{1};
-        }
-    };
-
-    struct ModemAdded
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemAdded"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::tuple<core::dbus::types::ObjectPath, std::map<std::string, std::string>> ArgumentType;
-    };
-
-    struct ModemRemoved
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemRemoved"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef core::dbus::types::ObjectPath ArgumentType;
-    };
-
-    struct Modem
-    {
-        struct NetworkRegistration
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"org.ofono.NetworkRegistration"};
-                return s;
-            }
-
-            struct GetProperties
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"GetProperties"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::map<std::string, core::dbus::types::Variant<>> ValueType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{1};
-                }
-            };
-
-            struct Mode
-            {
-                static const char* unregistered() { return "unregistered"; }
-                static const char* registered() { return "registered"; }
-                static const char* searching() { return "searching"; }
-                static const char* denied() { return "denied"; }
-                static const char* unknown() { return "unknown"; }
-                static const char* roaming() { return "roaming"; }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Mode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct LocationAreaCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"LocationAreaCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint16_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct CellId
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"CellId"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint32_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileCountryCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileCountryCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileNetworkCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileNetworkCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Technology
-            {
-                static const char* gsm() { return "gsm"; }
-                static const char* edge() { return "edge"; }
-                static const char* umts() { return "umts"; }
-                static const char* hspa() { return "hspa"; }
-                static const char* lte() { return "lte"; }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Technology"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Strength
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Strength"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::int8_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            NetworkRegistration(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  properties{}
-            {
-                auto result = object->invoke_method_synchronously<GetProperties, GetProperties::ValueType>();
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                properties = result.value();
-            }
-
-            template<typename Property>
-            typename Property::ValueType get(
-                    const typename Property::ValueType& default_value = typename Property::ValueType{}) const
-            {
-                try
-                {
-                    core::dbus::types::Any value = properties.at(Property::name()).get();
-                    typename Property::ValueType result; value.reader() >> result;
-
-                    return result;
-                } catch(...)
-                {
-                }
-
-                return default_value;
-            }
-
-            std::shared_ptr<core::dbus::Object> object;
-            GetProperties::ValueType properties;
-        };
-
-        Modem(const std::shared_ptr<core::dbus::Service>& service,
-              const std::shared_ptr<core::dbus::Object>& object)
-            : service(service),
-              object(object),
-              network_registration{object}
-        {
-        }
-
-        std::shared_ptr<core::dbus::Service> service;
-        std::shared_ptr<core::dbus::Object> object;
-        NetworkRegistration network_registration;
-    };
-
-    Manager(const core::dbus::Bus::Ptr& bus)
-        : service(core::dbus::Service::use_service<org::Ofono>(bus)),
-          object(service->object_for_path(core::dbus::types::ObjectPath("/"))),
-          modem_added(object->get_signal<ModemAdded>()),
-          modem_removed(object->get_signal<ModemRemoved>())
-    {
-        auto result = object->invoke_method_synchronously<GetModems, GetModems::ResultType>();
-
-        if (result.is_error())
-            connectivity::throw_dbus_exception(result.error());
-
-        for (const auto& element : result.value())
-        {
-            modems.insert(
-                        std::make_pair(
-                            element.value,
-                            Modem
-                            {
-                                service,
-                                service->object_for_path(element.value)
-                            }));
-        }
-
-        modem_added->connect([this](const ModemAdded::ArgumentType& arg)
-        {
-            std::lock_guard<std::mutex> lg(guard);
-            modems.insert(
-                        std::make_pair(
-                            std::get<0>(arg),
-                            Modem{
-                                service,
-                                service->object_for_path(std::get<0>(arg))
-                            }));
-        });
-
-        modem_removed->connect([this](const ModemRemoved::ArgumentType& arg)
-        {
-            std::lock_guard<std::mutex> lg(guard);
-            modems.erase(arg);
-        });
-    }
-
-    void for_each_modem(const std::function<void(const Modem&)>& functor) const
-    {
-        std::lock_guard<std::mutex> lg(guard);
-        for (const auto& modem : modems)
-        {
-            functor(modem.second);
-        }
-    }
-
-    std::shared_ptr<core::dbus::Service> service;
-    std::shared_ptr<core::dbus::Object> object;
-    std::shared_ptr<core::dbus::Signal<ModemAdded, ModemAdded::ArgumentType>> modem_added;
-    std::shared_ptr<core::dbus::Signal<ModemRemoved, ModemRemoved::ArgumentType>> modem_removed;
-    mutable std::mutex guard;
-    std::map<core::dbus::types::ObjectPath, Modem> modems;
-};
-};
-}
-
-#endif // LOCATION_SERVICE_LOCATION_CONNECTIVITY_OFONO_H

=== removed file 'src/connectivity-cpp/dbus-cpp/services/urfkill.h'
--- src/connectivity-cpp/dbus-cpp/services/urfkill.h	2014-10-23 21:46:41 +0000
+++ src/connectivity-cpp/dbus-cpp/services/urfkill.h	1970-01-01 00:00:00 +0000
@@ -1,338 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Antti Kaijanmäki <[e-mail]>
- */
-#ifndef PLATFORM_MANAGER_NMOFONO_URFKILL_H
-#define PLATFORM_MANAGER_NMOFONO_URFKILL_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/any.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-#include "util.h"
-
-namespace org
-{
-namespace freedesktop
-{
-namespace URfkill
-{
-
-struct Interface
-{
-    struct Killswitch
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.freedesktop.URfkill.Killswitch"};
-            return s;
-        }
-
-        struct Property
-        {
-            struct State
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"state"};
-                    return s;
-                }
-
-                typedef Killswitch Interface;
-                typedef std::int32_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-        };
-
-        enum class Type;
-        Killswitch(const std::shared_ptr<core::dbus::Object>& object,
-                   Type type)
-            : object(object),
-              type(type),
-              _state(object->get_property<Property::State>())
-        {
-            _state->changed().connect(std::bind(&Killswitch::_stateChanged, this, std::placeholders::_1));
-            _stateChanged(_state->get());
-        }
-
-        enum class State
-        {
-            not_available = -1,
-            unblocked = 0,
-            soft_blocked = 1,
-            hard_blocked = 2
-        };
-
-        enum class Type {
-            bluetooth,
-            fm,
-            gps,
-            nfc,
-            uwb,
-            wimax,
-            wlan,
-            wwan
-        };
-
-        static const std::string path(Type type)
-        {
-            switch(type) {
-            case Type::bluetooth:
-                return "/org/freedesktop/URfkill/BLUETOOTH";
-            case Type::fm:
-                return "/org/freedesktop/URfkill/FM";
-            case Type::gps:
-                return "/org/freedesktop/URfkill/GPS";
-            case Type::nfc:
-                return "/org/freedesktop/URfkill/NFC";
-            case Type::uwb:
-                return "/org/freedesktop/URfkill/UWB";
-            case Type::wimax:
-                return "/org/freedesktop/URfkill/WIMAX";
-            case Type::wlan:
-                return "/org/freedesktop/URfkill/WLAN";
-            case Type::wwan:
-                return "/org/freedesktop/URfkill/WWAN";
-            }
-
-            return "";
-        }
-
-        void _stateChanged(Property::State::ValueType val)
-        {
-            if (val == -1)
-                state.set(State::not_available);
-            else if (val == 0)
-                state.set(State::unblocked);
-            else if (val == 1)
-                state.set(State::soft_blocked);
-            else if (val == 2)
-                state.set(State::hard_blocked);
-            else
-                throw std::runtime_error("got unknown Killswitch state from urfkill: " + std::to_string(val));
-        }
-
-        std::shared_ptr<core::dbus::Object> object;
-        const Type type;
-        std::shared_ptr<core::dbus::Property<Property::State>> _state;
-        core::Property<State> state;
-    };
-
-    struct URfkill
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.freedesktop.URfkill"};
-            return s;
-        }
-
-        struct Method
-        {
-            struct Block
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Block"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ResultType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{30};
-                }
-            };
-
-            struct FlightMode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"FlightMode"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ResultType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{30};
-                }
-            };
-
-            struct IsFlightMode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"IsFlightMode"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ResultType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{30};
-                }
-            };
-        };
-
-        struct Signal
-        {
-            struct FlightModeChanged
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"FlightModeChanged"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ArgumentType;
-            };
-        };
-
-        URfkill(std::shared_ptr<core::dbus::Service> &service,
-                std::shared_ptr<core::dbus::Object> &object)
-            : service{service},
-              object{object},
-              flightModeChanged{object->get_signal<Signal::FlightModeChanged>()}
-        {
-            switches[Killswitch::Type::bluetooth] = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::bluetooth)), Killswitch::Type::bluetooth);
-            switches[Killswitch::Type::fm]        = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::fm)),        Killswitch::Type::fm);
-            switches[Killswitch::Type::gps]       = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::gps)),       Killswitch::Type::gps);
-            switches[Killswitch::Type::nfc]       = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::nfc)),       Killswitch::Type::nfc);
-            switches[Killswitch::Type::uwb]       = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::uwb)),       Killswitch::Type::uwb);
-            switches[Killswitch::Type::wimax]     = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::wimax)),     Killswitch::Type::wimax);
-            switches[Killswitch::Type::wlan]      = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::wlan)),      Killswitch::Type::wlan);
-            switches[Killswitch::Type::wwan]      = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::wwan)),      Killswitch::Type::wwan);
-        }
-
-        bool block(Killswitch::Type type, bool block)
-        {
-            std::uint32_t utype;
-            switch (type) {
-            case Killswitch::Type::bluetooth:
-                utype = 2;
-                break;
-            case Killswitch::Type::fm:
-                utype = 7;
-                break;
-            case Killswitch::Type::gps:
-                utype = 6;
-                break;
-            case Killswitch::Type::nfc:
-                utype = 8; /// @todo verify me
-                break;
-            case Killswitch::Type::uwb:
-                utype = 3;
-                break;
-            case Killswitch::Type::wimax:
-                utype = 4;
-                break;
-            case Killswitch::Type::wlan:
-                utype = 1;
-                break;
-            case Killswitch::Type::wwan:
-                utype = 5;
-                break;
-            }
-            // we can't handle "all" (0) with this, but that's deprecated by FlightMode anyway
-
-            auto result =
-                    object->invoke_method_synchronously<
-                       Method::Block, Method::Block::ResultType>
-                    (utype, block);
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            return result.value();
-        }
-
-        bool flightMode(bool block)
-        {
-            auto result =
-                    object->invoke_method_synchronously<
-                       Method::FlightMode, Method::FlightMode::ResultType>
-                    (block);
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            return result.value();
-        }
-
-        bool isFlightMode()
-        {
-            auto result =
-                    object->invoke_method_synchronously<
-                       Method::IsFlightMode, Method::IsFlightMode::ResultType>
-                    ();
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            return result.value();
-        }
-
-        std::shared_ptr<core::dbus::Service> service;
-        std::shared_ptr<core::dbus::Object> object;
-        std::shared_ptr<core::dbus::Signal<Signal::FlightModeChanged, Signal::FlightModeChanged::ArgumentType>> flightModeChanged;
-
-        std::map<Killswitch::Type, std::shared_ptr<Killswitch>> switches;
-    };
-};
-
-struct Service
-{
-    std::shared_ptr<Interface::URfkill> urfkill;
-
-    Service(const core::dbus::Bus::Ptr& bus)
-    {
-        auto service = core::dbus::Service::use_service<Interface::URfkill>(bus);
-        auto object = service->object_for_path(core::dbus::types::ObjectPath("/org/freedesktop/URfkill"));
-        urfkill = std::make_shared<Interface::URfkill>(service, object);
-    }
-
-    struct Mock
-    {
-        std::shared_ptr<Interface::URfkill> urfkill;
-
-        Mock(const core::dbus::Bus::Ptr& bus)
-        {
-            auto service = core::dbus::Service::add_service<Interface::URfkill>(bus);
-            auto object = service->add_object_for_path(core::dbus::types::ObjectPath("/org/freedesktop/URfkill"));
-            urfkill = std::make_shared<Interface::URfkill>(service, object);
-        }
-    };
-};
-}
-}
-}
-
-#endif // PLATFORM_MANAGER_NMOFONO_URFKILL_H

=== removed file 'src/connectivity-cpp/dbus-cpp/services/util.h'
--- src/connectivity-cpp/dbus-cpp/services/util.h	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/dbus-cpp/services/util.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jussi Pakkanen <[e-mail]>
- */
-
-#ifndef CONNECTIVITY_UTIL_H
-#define CONNECTIVITY_UTIL_H
-
-namespace core {
-namespace dbus {
-class Error;
-}
-}
-
-namespace connectivity {
-
-void throw_dbus_exception(const core::dbus::Error &e);
-
-}
-
-
-#endif

=== removed directory 'src/connectivity-cpp/include/connectivity'
=== removed directory 'src/connectivity-cpp/include/connectivity/networking'
=== removed directory 'src/connectivity-cpp/include/connectivity/networking/service'
=== removed file 'src/connectivity-cpp/include/connectivity/networking/service.h'
--- src/connectivity-cpp/include/connectivity/networking/service.h	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/include/connectivity/networking/service.h	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Antti Kaijanmäki <[e-mail]>
- */
-
-#ifndef CONNECTIVITY_NETWORKING_SERVICE
-#define CONNECTIVITY_NETWORKING_SERVICE
-
-#include <connectivity/networking/link.h>
-
-#include <memory>
-
-namespace connectivity {
-namespace networking {
-
-#ifndef CONNECTIVITY_CPP_EXPORT
-#define CONNECTIVITY_CPP_EXPORT __attribute ((visibility ("default")))
-#endif
-
-/// @private
-class CONNECTIVITY_CPP_EXPORT
-Service
-{
-public:
-
-    typedef std::shared_ptr<Service> Ptr;
-
-    enum class Type {
-        vpn,
-        tethering,
-        tor
-    };
-    virtual Type type() const = 0;
-
-    enum class Status {
-        stopped,
-        starting,
-        running
-    };
-
-    virtual ~Service() = default;
-
-    virtual const core::Property<Status>& status() const = 0;
-
-    // which other Service this service requires to be active
-    // before it can be activated
-    virtual std::shared_ptr<Service> requires() = 0;
-
-    // possible link this service provides.
-    // check with:
-    //    if (service->link()) {
-    //        // we have a link coming from the service
-    //        do_something_with(link);
-    //    }
-    virtual Link::Ptr link() = 0;
-
-    virtual void start()  = 0;
-    virtual void stop() = 0;
-
-    typedef unsigned int Id;
-    virtual Id id() const = 0;
-
-    virtual core::Property<std::string>& name() const = 0;
-};
-
-}
-}
-
-#endif

=== removed directory 'src/connectivity-cpp/include/connectivity/networking/service/tethering'
=== removed file 'src/connectivity-cpp/include/connectivity/networking/service/tethering/service.h'
--- src/connectivity-cpp/include/connectivity/networking/service/tethering/service.h	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/include/connectivity/networking/service/tethering/service.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Antti Kaijanmäki <[e-mail]>
- */
-
-#ifndef CONNECTIVITY_NETWORKING_SERVICE_TETHERING_SERVICE
-#define CONNECTIVITY_NETWORKING_SERVICE_TETHERING_SERVICE
-
-#include <com/ubuntu/connectivity/networking/service.h>
-
-namespace connectivity {
-namespace networking {
-namespace service {
-
-namespace tethering {
-
-/// @private
-class
-Service : public connectivity::networking::Service
-{
-public:
-    typedef std::shared_ptr<Service> Ptr;
-    virtual ~Service() = default;
-
-    /*
-     * Which link is shared to the client devices.
-     */
-    const core::Property<std::shared_ptr<Link>> &shared() = 0;
-
-    /*
-     * Which link is used to serve the clients.
-     */
-    const core::Property<std::shared_ptr<Link>> &sharedOver() = 0;
-
-
-protected:
-    Service() = default;
-};
-
-}
-}
-}
-}
-
-#endif

=== removed directory 'src/connectivity-cpp/include/connectivity/networking/service/tor'
=== removed file 'src/connectivity-cpp/include/connectivity/networking/service/tor/service.h'
--- src/connectivity-cpp/include/connectivity/networking/service/tor/service.h	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/include/connectivity/networking/service/tor/service.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Antti Kaijanmäki <[e-mail]>
- */
-
-#ifndef CONNECTIVITY_NETWORKING_SERVICE_TOR_SERVICE
-#define CONNECTIVITY_NETWORKING_SERVICE_TOR_SERVICE
-
-#include <connectivity/networking/service.h>
-
-namespace connectivity {
-namespace networking {
-namespace service {
-namespace tor {
-
-/// @private
-class
-Service : public connectivity::networking::Service
-{
-public:
-    typedef std::shared_ptr<Service> Ptr;
-    virtual ~Service() = default;
-
-    virtual const core::Property<std::shared_ptr<Link>> &establishedOver() const = 0;
-};
-
-}
-}
-}
-}
-
-#endif

=== removed directory 'src/connectivity-cpp/include/connectivity/networking/service/vpn'
=== removed file 'src/connectivity-cpp/include/connectivity/networking/service/vpn/service.h'
--- src/connectivity-cpp/include/connectivity/networking/service/vpn/service.h	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/include/connectivity/networking/service/vpn/service.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Antti Kaijanmäki <[e-mail]>
- */
-
-#ifndef CONNECTIVITY_NETWORKING_SERVICE_VPN_SERVICE
-#define CONNECTIVITY_NETWORKING_SERVICE_VPN_SERVICE
-
-#include <connectivity/networking/service.h>
-
-namespace connectivity {
-namespace networking {
-namespace service {
-namespace vpn {
-
-/// @private
-class
-Service : public connectivity::networking::Service
-{
-public:
-    typedef std::shared_ptr<Service> Ptr;
-    virtual ~Service() = default;
-
-    virtual const core::Property<std::shared_ptr<Link>> &establishedOver() const = 0;
-
-protected:
-    Service() = default;
-};
-
-}
-}
-}
-}
-
-#endif

=== removed directory 'src/connectivity-cpp/include/connectivity/networking/wifi'
=== modified file 'src/connectivity-cpp/src/CMakeLists.txt'
--- src/connectivity-cpp/src/CMakeLists.txt	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/src/CMakeLists.txt	2015-04-01 15:30:55 +0000
@@ -16,15 +16,34 @@
 #     Antti Kaijanmäki <[e-mail]>
 
 add_library(connectivity-cpp STATIC
+    platform/nmofono/kill-switch.cpp
+    platform/nmofono/manager.cpp
+    platform/nmofono/manager.h
+    platform/nmofono/service.cpp
+    platform/nmofono/service.h
+    platform/nmofono/wifi/access-point-impl.h
+    platform/nmofono/wifi/access-point-impl.cpp
+    platform/nmofono/wifi/grouped-access-point.h
+    platform/nmofono/wifi/grouped-access-point.cpp
+    platform/nmofono/wifi/link.h
+    platform/nmofono/wifi/link.cpp
+
+    #platform/nmofono/ofono_nm_connectivity_manager.cpp
+    platform/nmofono/set_name_for_thread.cpp
+    platform/nmofono/set_name_for_thread.h
+
+    ../include/connectivity/networking/wifi/access-point.cpp
     manager.cpp
 )
+
 set_target_properties(connectivity-cpp PROPERTIES
   VERSION ${CONNECTIVITY_CPP_VERSION_MAJOR}.${CONNECTIVITY_CPP_VERSION_MINOR}.${CONNECTIVITY_CPP_VERSION_PATCH}
   SOVERSION ${CONNECTIVITY_CPP_VERSION_MAJOR}
   OUTPUT_NAME "connectivity-cpp"
 )
-target_link_libraries(connectivity-cpp platform_nmofono)
-
-add_subdirectory(platform/nmofono)
-
-
+
+target_link_libraries(connectivity-cpp
+    connectivity-backend
+    ${DBUSCPP_LIBRARIES}
+    ${GLIB_LIBRARIES}
+)

=== added directory 'src/connectivity-cpp/src/platform'
=== removed directory 'src/connectivity-cpp/src/platform'
=== added directory 'src/connectivity-cpp/src/platform/nmofono'
=== removed file 'src/connectivity-cpp/src/platform/nmofono/CMakeLists.txt'
--- src/connectivity-cpp/src/platform/nmofono/CMakeLists.txt	2014-08-22 14:56:59 +0000
+++ src/connectivity-cpp/src/platform/nmofono/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# Copyright © 2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3,
-# as published by the Free Software Foundation.
-#
-# 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authors:
-#     Antti Kaijanmäki <[e-mail]>
-
-set(NMOFONO_PLATFORM_SOURCES
-    kill-switch.cpp
-    manager.cpp
-    manager.h
-    service.cpp
-    service.h
-    wifi/access-point.h
-    wifi/access-point.cpp
-    wifi/grouped-access-point.h
-    wifi/grouped-access-point.cpp
-    wifi/link.h
-    wifi/link.cpp
-    ../util.cpp
-
-    #ofono_nm_connectivity_manager.cpp
-    set_name_for_thread.cpp
-    set_name_for_thread.h
-)
-
-add_library(platform_nmofono STATIC ${NMOFONO_PLATFORM_SOURCES})
-target_link_libraries(
-    platform_nmofono
-    ${DBUSCPP_LIBRARIES}
-    ${GLIB_LIBRARIES}
-)

=== removed file 'src/connectivity-cpp/src/platform/nmofono/bounded_integer.h'
--- src/connectivity-cpp/src/platform/nmofono/bounded_integer.h	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/src/platform/nmofono/bounded_integer.h	1970-01-01 00:00:00 +0000
@@ -1,178 +0,0 @@
-/*
- * Copyright © 2012-2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_LOCATION_CONNECTIVITY_BOUNDED_INTEGER_H_
-#define LOCATION_SERVICE_LOCATION_CONNECTIVITY_BOUNDED_INTEGER_H_
-
-#include <iostream>
-#include <stdexcept>
-
-namespace location
-{
-namespace connectivity
-{
-/**
- * @brief A helper class to handle bounded integer values, with an optional domain
- * for tagging domain-specific types.
- */
-template<int min, int max, int domain = 0>
-class BoundedInteger
-{
-public:
-    static_assert(min < max, "min >= max");
-
-    /**
-     * @brief Access the minimum value of the integer.
-     */
-    inline static int minimum()
-    {
-        return min;
-    }
-
-    /**
-     * @brief Access the maximum value of the integer.
-     */