-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 @@ | |||
4 | - fix layout of edit account, i.e. get it shown maximised | 4 | - fix layout of edit account, i.e. get it shown maximised |
5 | - popup configure modem with the correct account prselected | 5 | - popup configure modem with the correct account prselected |
6 | not quite shure why it does not work... IMHO it should work | 6 | not quite shure why it does not work... IMHO it should work |
7 | - remove interfaces | 7 | |
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) { | |||
1245 | 1245 | ||
1246 | QString PPPData::modemGroup() | 1246 | QString PPPData::modemGroup() |
1247 | { | 1247 | { |
1248 | if (modemDeviceGroup<0)qFatal("wrong modem %i",modemDeviceGroup); | 1248 | if (modemDeviceGroup<0){ |
1249 | qDebug("wrong modem %i\n using 0",modemDeviceGroup); | ||
1250 | modemDeviceGroup = 0; //FIXME! | ||
1251 | } | ||
1249 | return QString("%1_%1").arg(MODEM_GRP).arg(modemDeviceGroup); | 1252 | return QString("%1_%1").arg(MODEM_GRP).arg(modemDeviceGroup); |
1250 | } | 1253 | } |
1251 | 1254 | ||
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(){ | |||
105 | */ | 105 | */ |
106 | Interface *PPPModule::addNewInterface(const QString &newInterface){ | 106 | Interface *PPPModule::addNewInterface(const QString &newInterface){ |
107 | 107 | ||
108 | qDebug("try to add iface %s",newInterface.latin1()); | ||
109 | |||
110 | InterfacePPP *ifaceppp; | 108 | InterfacePPP *ifaceppp; |
111 | Interface *iface; | 109 | Interface *iface; |
112 | ifaceppp = new InterfacePPP(); | 110 | ifaceppp = new InterfacePPP(); |
113 | PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); | 111 | PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); |
114 | imp.showMaximized(); | 112 | imp.showMaximized(); |
115 | if(imp.exec() == QDialog::Accepted ){ | 113 | if(imp.exec() == QDialog::Accepted ){ |
114 | iface = (InterfacePPP*) ifaceppp; | ||
116 | iface->setModuleOwner( this ); | 115 | iface->setModuleOwner( this ); |
117 | iface = ifaceppp; | ||
118 | list.append( iface ); | 116 | list.append( iface ); |
119 | return iface; | 117 | return iface; |
120 | }else { | 118 | }else { |
121 | delete iface; | 119 | delete ifaceppp; |
122 | iface = NULL; | 120 | iface = NULL; |
123 | } | 121 | } |
124 | return iface; | 122 | return iface; |
@@ -128,9 +126,8 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ | |||
128 | * Attempts to remove the interface, doesn't delete i | 126 | * Attempts to remove the interface, doesn't delete i |
129 | * @return bool true if successfull, false otherwise. | 127 | * @return bool true if successfull, false otherwise. |
130 | */ | 128 | */ |
131 | bool PPPModule::remove(Interface*){ | 129 | bool PPPModule::remove(Interface *i){ |
132 | // Can't remove a hardware device, you can stop it though. | 130 | return list.remove(i); |
133 | return false; | ||
134 | } | 131 | } |
135 | 132 | ||
136 | void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) | 133 | void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) |