diff options
Diffstat (limited to 'tdenetworkmanager/src/tdenetman-vpnmanager.cpp')
| -rw-r--r-- | tdenetworkmanager/src/tdenetman-vpnmanager.cpp | 136 |
1 files changed, 81 insertions, 55 deletions
diff --git a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp index f106455..756451e 100644 --- a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp +++ b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp @@ -42,37 +42,50 @@ VPNManager::getVPNServices () VPNServiceList list; TDEGlobalNetworkManager* nm = TDEGlobal::networkManager(); - TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes(); - if (availablePlugins.count() > 0) { - // find all available services - for (TDENetworkVPNTypeList::Iterator it = availablePlugins.begin (); it != availablePlugins.end (); ++it) { - TQString serviceString; - if ((*it) == TDENetworkVPNType::OpenVPN) { - serviceString = "openvpn"; - } - else if ((*it) == TDENetworkVPNType::PPTP) { - serviceString = "pptp"; - } - else if ((*it) == TDENetworkVPNType::StrongSwan) { - serviceString = "strongswan"; - } - else if ((*it) == TDENetworkVPNType::VPNC) { - serviceString = "vpnc"; - } - if (serviceString == "") { - continue; - } + if (nm) + { + TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes(); - kdDebug() << "VPN Service " << serviceString.ascii() << endl; + if (availablePlugins.count() > 0) + { + // find all available services + for (TDENetworkVPNTypeList::Iterator it = availablePlugins.begin (); it != availablePlugins.end (); ++it) + { + TQString serviceString; + if ((*it) == TDENetworkVPNType::OpenVPN) + { + serviceString = "openvpn"; + } + else if ((*it) == TDENetworkVPNType::PPTP) + { + serviceString = "pptp"; + } + else if ((*it) == TDENetworkVPNType::StrongSwan) + { + serviceString = "strongswan"; + } + else if ((*it) == TDENetworkVPNType::VPNC) + { + serviceString = "vpnc"; + } + if (serviceString == "") + { + continue; + } - // create new VPNService Object - VPNService* vpnservice = new VPNService(serviceString, serviceString, TQT_TQOBJECT(TDENetworkManager::getInstance())); - if (!vpnservice->getVPNPlugin()) { - delete vpnservice; - } - else { - list.push_back(vpnservice); + kdDebug() << "VPN Service " << serviceString.ascii() << endl; + + // create new VPNService Object + VPNService* vpnservice = new VPNService(serviceString, serviceString, TQT_TQOBJECT(TDENetworkManager::getInstance())); + if (!vpnservice->getVPNPlugin()) + { + delete vpnservice; + } + else + { + list.push_back(vpnservice); + } } } } @@ -86,35 +99,48 @@ VPNManager::getVPNService(TQString service_type) VPNServiceList list; TDEGlobalNetworkManager* nm = TDEGlobal::networkManager(); - TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes(); - - if (availablePlugins.count() > 0) { - for (TDENetworkVPNTypeList::Iterator it = availablePlugins.begin (); it != availablePlugins.end (); ++it) { - TQString serviceString; - if ((*it) == TDENetworkVPNType::OpenVPN) { - serviceString = "openvpn"; - } - else if ((*it) == TDENetworkVPNType::PPTP) { - serviceString = "pptp"; - } - else if ((*it) == TDENetworkVPNType::StrongSwan) { - serviceString = "strongswan"; - } - else if ((*it) == TDENetworkVPNType::VPNC) { - serviceString = "vpnc"; - } - if (serviceString == "") { - continue; - } + if (nm) + { + TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes(); - if (serviceString == service_type) { - // create new VPNService Object - VPNService* vpnservice = new VPNService(service_type, service_type, TQT_TQOBJECT(TDENetworkManager::getInstance())); - if (!vpnservice->getVPNPlugin()) { - delete vpnservice; + if (availablePlugins.count() > 0) + { + for (TDENetworkVPNTypeList::Iterator it = availablePlugins.begin (); it != availablePlugins.end (); ++it) + { + TQString serviceString; + if ((*it) == TDENetworkVPNType::OpenVPN) + { + serviceString = "openvpn"; + } + else if ((*it) == TDENetworkVPNType::PPTP) + { + serviceString = "pptp"; + } + else if ((*it) == TDENetworkVPNType::StrongSwan) + { + serviceString = "strongswan"; } - else { - return vpnservice; + else if ((*it) == TDENetworkVPNType::VPNC) + { + serviceString = "vpnc"; + } + if (serviceString == "") + { + continue; + } + + if (serviceString == service_type) + { + // create new VPNService Object + VPNService* vpnservice = new VPNService(service_type, service_type, TQT_TQOBJECT(TDENetworkManager::getInstance())); + if (!vpnservice->getVPNPlugin()) + { + delete vpnservice; + } + else + { + return vpnservice; + } } } } |