Diffstat (limited to 'noncore/settings/networksettings/ppp/pppdata.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdata.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 | |||
@@ -1224,49 +1224,52 @@ void PPPData::setpppdArgumentDefaults() { | |||
1224 | 1224 | ||
1225 | 1225 | ||
1226 | 1226 | ||
1227 | // | 1227 | // |
1228 | //functions to change/set the child pppd process info | 1228 | //functions to change/set the child pppd process info |
1229 | // | 1229 | // |
1230 | bool PPPData::pppdRunning() const { | 1230 | bool PPPData::pppdRunning() const { |
1231 | return pppdisrunning; | 1231 | return pppdisrunning; |
1232 | } | 1232 | } |
1233 | 1233 | ||
1234 | void PPPData::setpppdRunning(bool set) { | 1234 | void PPPData::setpppdRunning(bool set) { |
1235 | pppdisrunning = set; | 1235 | pppdisrunning = set; |
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | int PPPData::pppdError() const { | 1238 | int PPPData::pppdError() const { |
1239 | return pppderror; | 1239 | return pppderror; |
1240 | } | 1240 | } |
1241 | 1241 | ||
1242 | void PPPData::setpppdError(int err) { | 1242 | void PPPData::setpppdError(int err) { |
1243 | pppderror = err; | 1243 | pppderror = err; |
1244 | } | 1244 | } |
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 | ||
1252 | 1255 | ||
1253 | QMap<QString,QString> PPPData::getConfiguredInterfaces() | 1256 | QMap<QString,QString> PPPData::getConfiguredInterfaces() |
1254 | { | 1257 | { |
1255 | QMap<QString,QString> ifaces; | 1258 | QMap<QString,QString> ifaces; |
1256 | Config config = PPPData::config(); | 1259 | Config config = PPPData::config(); |
1257 | config.setGroup(ACCLIST_GRP); | 1260 | config.setGroup(ACCLIST_GRP); |
1258 | int count = config.readNumEntry( ACCOUNTS_COUNT, -1 ); | 1261 | int count = config.readNumEntry( ACCOUNTS_COUNT, -1 ); |
1259 | QString accGrp, dev, acc; | 1262 | QString accGrp, dev, acc; |
1260 | for (int i = 0; i < count; i++){ | 1263 | for (int i = 0; i < count; i++){ |
1261 | accGrp = QString("%1_%1").arg(ACCLIST_GRP).arg(i); | 1264 | accGrp = QString("%1_%1").arg(ACCLIST_GRP).arg(i); |
1262 | config.setGroup(accGrp); | 1265 | config.setGroup(accGrp); |
1263 | dev = config.readEntry( ACOUNTS_DEV, "error" ); | 1266 | dev = config.readEntry( ACOUNTS_DEV, "error" ); |
1264 | acc = config.readEntry( ACOUNTS_ACC, "error" ); | 1267 | acc = config.readEntry( ACOUNTS_ACC, "error" ); |
1265 | ifaces.insert( dev, acc ); | 1268 | ifaces.insert( dev, acc ); |
1266 | } | 1269 | } |
1267 | 1270 | ||
1268 | return ifaces; | 1271 | return ifaces; |
1269 | } | 1272 | } |
1270 | 1273 | ||
1271 | void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces ) | 1274 | void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces ) |
1272 | { | 1275 | { |