pppd stuff

1 files changed, 16 insertions, 12 deletions

diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
index da17e26..e13f8c8 100644
--- a/noncore/settings/networksettings/ppp/pppmodule.cpp
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -5,13 +5,18 @@
 #include "interfaceinformationimp.h"
 //#include "devices.h"
 
 /**
  * Constructor, find all of the possible interfaces
  */
-PPPModule::PPPModule() : Module() {
+PPPModule::PPPModule() : Module()
+{
+    Interface *iface;
+    iface = new Interface( 0, "device" );
+    iface->setHardwareName( "account" );
+    list.append( iface );
 }
 
 /**
  * Delete any interfaces that we own.
  */
 PPPModule::~PPPModule(){
@@ -39,28 +44,23 @@ QString PPPModule::getPixmapName(Interface* ){
 /**
  * Check to see if the interface i is owned by this module.
  * @param Interface* interface to check against
  * @return bool true if i is owned by this module, false otherwise.
  */
 bool PPPModule::isOwner(Interface *i){
-  if(!i->getInterfaceName().upper().contains("PPP"))
-    return false;
-
-  i->setHardwareName("PPP");
-  list.append(i);
-  return true;
+    return list.find( i ) != -1;
 }
 
 /**
  * Create, and return the WLANConfigure Module
  * @return QWidget* pointer to this modules configure.
  */
 QWidget *PPPModule::configure(Interface *i){
     qDebug("return ModemWidget");
-    PPPConfigWidget *pppconfig = new PPPConfigWidget( 0, "PPPConfig",  false,  Qt::WDestructiveClose );
-//    pppconfig->setProfile(profile);
+    PPPConfigWidget *pppconfig = new PPPConfigWidget( 0, "PPPConfig",  false,
+                                                      Qt::WDestructiveClose );
     return pppconfig;
 }
 
 /**
  * Create, and return the Information Module
  * @return QWidget* pointer to this modules info.
@@ -94,14 +94,18 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){
   qDebug("try to add iface %s",newInterface.latin1());
 
   PPPConfigWidget imp(0, "PPPConfigImp", true);
   imp.showMaximized();
   if(imp.exec() == QDialog::Accepted ){
               qDebug("ACCEPTED");
-              return new Interface( 0, newInterface );
               PPPData::data()->save();
+              Interface *iface;
+              iface = new Interface( 0, PPPData::data()->modemDevice() );
+              iface->setHardwareName( PPPData::data()->accname() );
+              list.append( iface );
+              return iface;
   }
   return NULL;
 }
 
 /**
  * Attempts to remove the interface, doesn't delete i
@@ -111,11 +115,11 @@ bool PPPModule::remove(Interface*){
   // Can't remove a hardware device, you can stop it though.
   return false;
 }
 
 void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces)
 {
-    qDebug("here");
-        newIfaces.insert(QObject::tr("PPP") ,QObject::tr("generic ppp device"));
+    newIfaces.insert(QObject::tr("PPP") ,
+                     QObject::tr("generic ppp device"));
 }