networksetup -> networksettings, as reported by an OZ user.

2 files changed, 2 insertions, 2 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 9efc8c2..0ddc489 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -362,97 +362,97 @@ void MainWindowImp::informationClicked(){
 }

 

 /**

  * Update this interface.  If no QListViewItem exists create one.

  * @param Interface* pointer to the interface that needs to be updated.

  */ 

 void MainWindowImp::updateInterface(Interface *i){

   if(!advancedUserMode){

     if(i->getInterfaceName() == "lo")

       return;

   }

   

   QListViewItem *item = NULL;

   

   // Find the interface, making it if needed.

   if(items.find(i) == items.end()){

     item = new QListViewItem(connectionList, "", "", "");

     // See if you can't find a module owner for this interface

     QMap<Module*, QLibrary*>::Iterator it;

     for( it = libraries.begin(); it != libraries.end(); ++it ){

       if(it.key()->isOwner(i))

         i->setModuleOwner(it.key());

     }

     items.insert(i, item);

     interfaceItems.insert(item, i);

   }

   else

     item = items[i];

  

   // Update the icons and information 

   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     typeName = "lo";

   if(i->getInterfaceName().contains("irda"))

     typeName = "irda";

   if(i->getInterfaceName().contains("wlan"))

     typeName = "wlan";

   if(i->getInterfaceName().contains("usb"))

     typeName = "usb";

   

   if(!i->isAttached())

     typeName = "connect_no";

   // Actually try to use the Module

   if(i->getModuleOwner() != NULL)

     typeName = i->getModuleOwner()->getPixmapName(i);

   

-  item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName)));

+  item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));

   item->setText(2, i->getHardwareName());

   item->setText(3, QString("(%1)").arg(i->getInterfaceName()));

   item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));

 }

 

 void MainWindowImp::newProfileChanged(const QString& newText){

   if(newText.length() > 0)

    newProfileButton->setEnabled(true);

   else

     newProfileButton->setEnabled(false);

 }

 

 /**

  * Adds a new profile to the list of profiles.

  * Don't add profiles that already exists.

  * Appends to the list and QStringList

  */ 

 void MainWindowImp::addProfile(){

   QString newProfileName = newProfile->text();

   if(profiles.grep(newProfileName).count() > 0){

     QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok);

     return;

   }

   profiles.append(newProfileName);

   profilesList->insertItem(newProfileName);

 }

 

 /**

  * Removes the currently selected profile in the combo.

  * Doesn't delete if there are less then 2 profiles.

  */

 void MainWindowImp::removeProfile(){

   if(profilesList->count() <= 1){

     QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok);

     return;

   }

   QString profileToRemove = profilesList->currentText();

   if(profileToRemove == "All"){

     QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok);

     return;

   }

   // Can't remove the curent profile

   if(profileToRemove == currentProfileLabel->text()){

     QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok);

     return;

 

   }

   

diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro
index ec18a59..0e9e5b8 100644
--- a/noncore/settings/networksettings/ppp/ppp.pro
+++ b/noncore/settings/networksettings/ppp/ppp.pro
@@ -1,16 +1,16 @@
 TEMPLATE        = lib
 CONFIG          += qt warn_on release
 #CONFIG		+= qt warn_on debug
-DESTDIR         = $(OPIEDIR)/plugins/networksetup
+DESTDIR         = $(OPIEDIR)/plugins/networksettings
 HEADERS		= pppimp.h pppmodule.h
 SOURCES		= pppimp.cpp pppmodule.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include ../ ../interfaces/
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -L../interfaces/ -linterfaces
 INTERFACES	= ppp.ui
 TARGET		= pppplugin
 VERSION		= 1.0.0
 
 
 
 include ( $(OPIEDIR)/include.pro )