Update introspection to latest NM API

1 files changed, 15 insertions, 21 deletions

diff --git a/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt b/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt
index 70371c6ad..e179dad3e 100644
--- a/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt
+++ b/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt
@@ -35,31 +35,25 @@ function( add_dbus_xml option basename classname namespace xmlfile )
 endfunction( )
 
 add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml )
-add_dbus_xml( p networkmanagervpnproxy NetworkManagerVPNProxy DBus nm-vpn-manager.xml )
+add_dbus_xml( p networkmanagerpppproxy NetworkManagerPPPProxy DBus nm-ppp-manager.xml )
 add_dbus_xml( p deviceproxy DeviceProxy DBus nm-device.xml )
-add_dbus_xml( p wirelessproxy WirelessDeviceProxy DBus nm-device-802-11-wireless.xml )
-add_dbus_xml( p wiredproxy WiredDeviceProxy DBus nm-device-802-3-ethernet.xml )
-add_dbus_xml( p gsmproxy GSMDeviceProxy DBus nm-device-gsm.xml )
-add_dbus_xml( p cdmaproxy CDMADeviceProxy DBus nm-device-cdma.xml )
+add_dbus_xml( p wifiproxy WiFiDeviceProxy DBus nm-device-wifi.xml )
+add_dbus_xml( p wimaxproxy WiMaxDeviceProxy DBus nm-device-wimax.xml )
+add_dbus_xml( p ethernetproxy EthernetDeviceProxy DBus nm-device-ethernet.xml )
+add_dbus_xml( p infinibandproxy InfinibandDeviceProxy DBus nm-device-infiniband.xml )
+add_dbus_xml( p modemproxy ModemDeviceProxy DBus nm-device-modem.xml )
 add_dbus_xml( p accesspointproxy AccessPointProxy DBus nm-access-point.xml )
 add_dbus_xml( p activeconnectionproxy ActiveConnectionProxy DBus nm-active-connection.xml )
-add_dbus_xml( p vpnconnectionproxy VPNConnectionProxy DBus nm-vpn-connection-only.xml )
+add_dbus_xml( p vpnconnectionproxy VPNConnectionProxy DBus nm-vpn-connection.xml )
 add_dbus_xml( p vpnpluginproxy VPNPluginProxy DBus nm-vpn-plugin.xml )
 add_dbus_xml( i networkmanagersettings SettingsInterface DBus nm-settings.xml )
-add_dbus_xml( i connection "" DBus nm-exported-connection.xml )
-
-add_custom_command( OUTPUT connectionnode.cpp connectionnode.h introspectableinterface.cpp introspectableinterface.h
-    COMMAND ${DBUSXML2QT3_EXECUTABLE} -n connectionnode -c ConnectionNode -N DBus ${INTROSPECTIONPATH}/nm-exported-connection.xml 2>/dev/null
-    COMMAND sed s/\#include\\ \\"secrets.h\\"// connectionnode.cpp > connectionnode.cpp_tmp
-    COMMAND sed s/\#include\\ \\"introspectable.h\\"/\#include\\ \\"introspectableinterface.h\\"/ connectionnode.cpp_tmp > connectionnode.cpp
-    COMMAND rm -f connectionnode.cpp_tmp
-    DEPENDS ${INTROSPECTIONPATH}/nm-exported-connection.xml )
+add_dbus_xml( i connectionsettings ConnectionSettingsInterface DBus nm-settings-connection.xml )
 
 
 # generate moc files
 
-set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagervpnproxy.h wiredproxy.h
-  wirelessproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h gsmproxy.h cdmaproxy.h )
+set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagerpppproxy.h ethernetproxy.h
+  infinibandproxy.h wifiproxy.h wimaxproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h modemproxy.h )
 
 foreach( _header_file ${MOCHEADERS} )
   get_filename_component( _basename "${_header_file}" NAME_WE )
@@ -79,10 +73,10 @@ add_custom_command( OUTPUT mocfiles.cpp
 
 tde_add_library( tdenm_dbus STATIC_PIC
   SOURCES
-    networkmanagerproxy.cpp networkmanagervpnproxy.cpp
-    deviceproxy.cpp wiredproxy.cpp wirelessproxy.cpp
-    accesspointproxy.cpp networkmanagersettings.cpp
-    connection.cpp connectionnode.cpp introspectableinterface.cpp
+    networkmanagerproxy.cpp networkmanagerpppproxy.cpp
+    deviceproxy.cpp ethernetproxy.cpp infinibandproxy.cpp wifiproxy.cpp
+    wimaxproxy.cpp accesspointproxy.cpp networkmanagersettings.cpp
+    connectionsettings.cpp
     mocfiles.cpp activeconnectionproxy.cpp vpnconnectionproxy.cpp
-    vpnpluginproxy.cpp gsmproxy.cpp cdmaproxy.cpp
+    vpnpluginproxy.cpp modemproxy.cpp
 )