Add a couple of needed methods to the network-manager backend API

2 files changed, 19 insertions, 0 deletions

diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp
index 48f76fd46..713c2d51e 100644
--- a/tdecore/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/networkbackends/network-manager/network-manager.cpp
@@ -1478,6 +1478,10 @@ TDENetworkConnectionType::TDENetworkConnectionType TDENetworkConnectionManager_B
 	return connType;
 }
 
+TQString TDENetworkConnectionManager_BackendNM::backendName() {
+	return i18n("NetworkManager");
+}
+
 TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags TDENetworkConnectionManager_BackendNM::backendStatus() {
 	if (d->m_networkManagerProxy) {
 		TQ_UINT32 ret;
@@ -4535,6 +4539,19 @@ TQStringList TDENetworkConnectionManager_BackendNM::connectionPhysicalDeviceUUID
 	}
 }
 
+TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes() {
+	TDENetworkVPNTypeList ret;
+
+	// FIXME
+	// This backend should query NetworkManager to verify plugin availability before claiming support for a VPN type!
+	ret.append(TDENetworkVPNType::OpenVPN);
+	ret.append(TDENetworkVPNType::PPTP);
+	ret.append(TDENetworkVPNType::StrongSwan);
+	ret.append(TDENetworkVPNType::VPNC);
+
+	return ret;
+}
+
 TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManager_BackendNM::deactivateConnection(TQString uuid) {
 	TQT_DBusObjectPath existingConnection;
 	TQT_DBusError error;
diff --git a/tdecore/networkbackends/network-manager/network-manager.h b/tdecore/networkbackends/network-manager/network-manager.h
index c9186e442..6a9e8ebc9 100644
--- a/tdecore/networkbackends/network-manager/network-manager.h
+++ b/tdecore/networkbackends/network-manager/network-manager.h
@@ -137,6 +137,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkCo
 		TDENetworkConnectionManager_BackendNM(TQString macAddress);
 		~TDENetworkConnectionManager_BackendNM();
 
+		virtual TQString backendName();
 		virtual TDENetworkDeviceType::TDENetworkDeviceType deviceType();
 		virtual TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags backendStatus();
 		virtual TDENetworkDeviceInformation deviceInformation();
@@ -155,6 +156,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkCo
 
 		virtual TDENetworkHWNeighborList* siteSurvey();
 		virtual TQStringList connectionPhysicalDeviceUUIDs(TQString uuid);
+		virtual TDENetworkVPNTypeList availableVPNTypes();
 
 		virtual bool networkingEnabled();
 		virtual bool wiFiHardwareEnabled();