summaryrefslogtreecommitdiff
authortille <tille>2003-06-03 14:51:12 (UTC)
committer tille <tille>2003-06-03 14:51:12 (UTC)
commit33cf1711b4d74036fa27dc971c25df236b8d0355 (patch) (side-by-side diff)
tree2a35ce380e40771089e22eed2d41dfc9577ff4cf
parent4e0c9efab5f3c73a1843e96983c9cd1894e44810 (diff)
downloadopie-33cf1711b4d74036fa27dc971c25df236b8d0355.zip
opie-33cf1711b4d74036fa27dc971c25df236b8d0355.tar.gz
opie-33cf1711b4d74036fa27dc971c25df236b8d0355.tar.bz2
should popup for passwd now...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/authwidget.cpp2
-rw-r--r--noncore/settings/networksettings/ppp/connect.cpp2
-rw-r--r--noncore/settings/networksettings/ppp/interfaceppp.cpp11
3 files changed, 9 insertions, 6 deletions
diff --git a/noncore/settings/networksettings/ppp/authwidget.cpp b/noncore/settings/networksettings/ppp/authwidget.cpp
index 86bea98..fa2b164 100644
--- a/noncore/settings/networksettings/ppp/authwidget.cpp
+++ b/noncore/settings/networksettings/ppp/authwidget.cpp
@@ -157,30 +157,32 @@ void AuthWidget::authChanged( const QString &authStr )
}
}
void AuthWidget::showUsernamePassword( bool show )
{
if (show){
user_l->show();
userName->show();
pw_l->show();
passWord->show();
store_password->show();
+ hidePw->show();
}else{//!show
user_l->hide();
userName->hide();
pw_l->hide();
passWord->hide();
store_password->hide();
+ hidePw->hide();
}
}
void AuthWidget::showScriptWindow( bool show )
{
if (show){
if (!scriptWidget){
scriptWidget = new ScriptWidget( _pppdata, this, isNewAccount, "scriptWid");
layout->addMultiCellWidget( scriptWidget, 1, 4, 0, 1 );
}
scriptWidget->show();
}else{ // !show
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp
index a93f93d..798431b 100644
--- a/noncore/settings/networksettings/ppp/connect.cpp
+++ b/noncore/settings/networksettings/ppp/connect.cpp
@@ -590,25 +590,25 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
emit debugMessage(i18n("Answer"));
setExpect(_ifaceppp->data()->modemRingResp());
vmain = 150;
return;
}
if (scriptCommand == "ID") {
QString bm = i18n("ID %1").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
- QString idstring = _ifaceppp->data()->storedUsername();
+ QString idstring = _ifaceppp->data()->password();
if(!idstring.isEmpty() && firstrunID) {
// the user entered an Id on the main kppp dialog
writeline(idstring);
firstrunID = false;
scriptindex++;
}
else {
// the user didn't enter and Id on the main kppp dialog
// let's query for an ID
/* if not around yet, then post window... */
if (prompt->Consumed()) {
diff --git a/noncore/settings/networksettings/ppp/interfaceppp.cpp b/noncore/settings/networksettings/ppp/interfaceppp.cpp
index 98bb4da..85ddbee 100644
--- a/noncore/settings/networksettings/ppp/interfaceppp.cpp
+++ b/noncore/settings/networksettings/ppp/interfaceppp.cpp
@@ -36,29 +36,30 @@ Modem* InterfacePPP::modem()
}
bool InterfacePPP::refresh()
{
qDebug("InterfacePPP::refresh()");
QMessageBox::information(0,"Not Implemented","This feature is not yet implemneted... ;-(");
return false;
}
void InterfacePPP::start()
{
qDebug("InterfacePPP::start");
- if (data()->password().isEmpty() ){
-//FIXME: ask for password
- qDebug("using dummy password");
- QMessageBox::critical( 0, "no password", "you should be prompted for a password, but you are not! ;-)");
- }
+// should work...
+// if (data()->password().isEmpty() ){
+// //FIXME: ask for password
+// qDebug("using dummy password");
+// QMessageBox::critical( 0, "no password", "you should be prompted for a password, but you are not! ;-)");
+// }
QFileInfo info(pppdPath());
if(!info.exists()){
QMessageBox::warning(0, tr("Error"),
i18n("<qt>Cannot find the PPP daemon!<br>"
"Make sure that pppd is installed and "
"that you have entered the correct path.</qt>"));
return;
}
//#if 0