-rw-r--r-- | noncore/settings/networksettings/ppp/TODO | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdata.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppmodule.cpp | 11 |
3 files changed, 9 insertions, 9 deletions
diff --git a/noncore/settings/networksettings/ppp/TODO b/noncore/settings/networksettings/ppp/TODO index 529d236..5635438 100644 --- a/noncore/settings/networksettings/ppp/TODO +++ b/noncore/settings/networksettings/ppp/TODO @@ -4,4 +4,4 @@ - fix layout of edit account, i.e. get it shown maximised - popup configure modem with the correct account prselected not quite shure why it does not work... IMHO it should work -- remove interfaces + diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp index 517dd8b..23db409 100644 --- a/noncore/settings/networksettings/ppp/pppdata.cpp +++ b/noncore/settings/networksettings/ppp/pppdata.cpp @@ -1245,7 +1245,10 @@ void PPPData::setpppdError(int err) { QString PPPData::modemGroup() { - if (modemDeviceGroup<0)qFatal("wrong modem %i",modemDeviceGroup); + if (modemDeviceGroup<0){ + qDebug("wrong modem %i\n using 0",modemDeviceGroup); + modemDeviceGroup = 0; //FIXME! + } return QString("%1_%1").arg(MODEM_GRP).arg(modemDeviceGroup); } diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index 95df068..8c401a9 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -105,20 +105,18 @@ QList<Interface> PPPModule::getInterfaces(){ */ Interface *PPPModule::addNewInterface(const QString &newInterface){ - qDebug("try to add iface %s",newInterface.latin1()); - InterfacePPP *ifaceppp; Interface *iface; ifaceppp = new InterfacePPP(); PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); imp.showMaximized(); if(imp.exec() == QDialog::Accepted ){ + iface = (InterfacePPP*) ifaceppp; iface->setModuleOwner( this ); - iface = ifaceppp; list.append( iface ); return iface; }else { - delete iface; + delete ifaceppp; iface = NULL; } return iface; @@ -128,9 +126,8 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ * Attempts to remove the interface, doesn't delete i * @return bool true if successfull, false otherwise. */ -bool PPPModule::remove(Interface*){ - // Can't remove a hardware device, you can stop it though. - return false; +bool PPPModule::remove(Interface *i){ + return list.remove(i); } void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) |