13 files changed, 25 insertions, 25 deletions

diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp
index 8487e3e..973b4b7 100644
--- a/noncore/settings/networksettings2/main.cpp
+++ b/noncore/settings/networksettings2/main.cpp
@@ -42,13 +42,9 @@ int main( int argc, char * argv[] ) {
         int Action = ACT_GUI;
         // could be overruled by -qws
         QApplication::Type GuiType = QApplication::GuiClient; 
 
-#ifdef _WS_QWS_
         QPEApplication * TheApp;
-#else
-        QApplication * TheApp;
-#endif
 
         for ( int i = 1; i < argc; i ++ ) {
           int rmv;
           rmv = 0;
@@ -83,20 +79,16 @@ int main( int argc, char * argv[] ) {
           Action = ACT_OT;
         }
 
         // Start Qt
-#ifdef _WS_QWS_
         // because QPEApplication does not handle GuiType well
         if( GuiType == QApplication::Tty ) {
           // this cast is NOT correct but we do not use
           // TheApp anymore ...
           TheApp = (QPEApplication *)new QApplication( argc, argv, GuiType );
         } else {
           TheApp = new QPEApplication( argc, argv, GuiType );
         }
-#else
-        TheApp = new QApplication( argc, argv, GuiType );
-#endif
 
         // init qt with app widget
 
         switch( Action ) {
@@ -150,13 +142,9 @@ int main( int argc, char * argv[] ) {
               }
               TheApp->setMainWidget( W ); 
 
               W->show();
-#ifdef _WS_QWS_
               W->showMaximized();
-#else
-              W->resize( W->sizeHint() );
-#endif
               rv = TheApp->exec();
 
               delete W;
             }
diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.cpp b/noncore/settings/networksettings2/networksettings2/systemfile.cpp
index 82fd43a..8deef94 100644
--- a/noncore/settings/networksettings2/networksettings2/systemfile.cpp
+++ b/noncore/settings/networksettings2/networksettings2/systemfile.cpp
@@ -7,9 +7,9 @@
 
 #include "resources.h"
 #include "systemfile.h"
 
-#define TEMPLATEDIR "networktemplates/"
+#define TEMPLATEDIR "NS2templates/"
 QString TemplDir;
 
 SystemFile::SystemFile( const QString & N, 
                         const QString & P,
diff --git a/noncore/settings/networksettings2/opie-networksettings2.control b/noncore/settings/networksettings2/opie-networksettings2.control
index 874833c..a79a740 100644
--- a/noncore/settings/networksettings2/opie-networksettings2.control
+++ b/noncore/settings/networksettings2/opie-networksettings2.control
@@ -1,6 +1,6 @@
 Package: opie-networksettings2
-Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png  etc/NS2templates/* etc/NS2templates/*/*
+Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png etc/NS2templates/* etc/NS2templates/*/* bin/NS2SetMac.sh
 Priority: optional
 Section: opie/settings
 Maintainer: wim delvaux <wimpie@handhelds.org>
 Architecture: arm
diff --git a/noncore/settings/networksettings2/opietooth2/OTDevice.h b/noncore/settings/networksettings2/opietooth2/OTDevice.h
index c2abb09..cf1c4b6 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDevice.h
+++ b/noncore/settings/networksettings2/opietooth2/OTDevice.h
@@ -15,10 +15,10 @@ class QTimerEvent;
 
 namespace Opie {
     namespace Core {
        class OProcess;
-    }
-}
+    };
+};
 
 namespace Opietooth2 {
 
     /**
diff --git a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h
index 8395f37..50f28fc 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h
+++ b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h
@@ -102,7 +102,7 @@ protected:
     bool     IsValid;
 
 };
 
-}
+};
 
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.h b/noncore/settings/networksettings2/opietooth2/OTDriver.h
index b54ffdf..f249cf7 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDriver.h
+++ b/noncore/settings/networksettings2/opietooth2/OTDriver.h
@@ -227,6 +227,6 @@ private:
       // backpointer to opietooth system 
       OTGateway *   OT;
 };
 
-}
+};
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTIcons.h b/noncore/settings/networksettings2/opietooth2/OTIcons.h
index ee10831..966ed24 100644
--- a/noncore/settings/networksettings2/opietooth2/OTIcons.h
+++ b/noncore/settings/networksettings2/opietooth2/OTIcons.h
@@ -48,7 +48,7 @@ private:
     UUIDVector Modems;
     UUIDVector Networks;
 
 };
-}
+};
 
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.h b/noncore/settings/networksettings2/opietooth2/OTInquiry.h
index f7bdeec..2682499 100644
--- a/noncore/settings/networksettings2/opietooth2/OTInquiry.h
+++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.h
@@ -173,6 +173,6 @@ private slots:
     void slotHCIEvent(unsigned char eventCode, QByteArray buf);
 
 };
 
-}
+};
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTPeer.h b/noncore/settings/networksettings2/opietooth2/OTPeer.h
index c09af15..9cd0dc7 100644
--- a/noncore/settings/networksettings2/opietooth2/OTPeer.h
+++ b/noncore/settings/networksettings2/opietooth2/OTPeer.h
@@ -129,7 +129,7 @@ private:
       int ProbePhase; // see OTDriver
       long ProbeTimeout;
 };
 
-}
+};
 
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h
index e79e33d..86b5623 100644
--- a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h
+++ b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h
@@ -134,7 +134,7 @@ private:
     } Value;
 
 };
 
-}
+};
 
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPService.h b/noncore/settings/networksettings2/opietooth2/OTSDPService.h
index 4831df0..21d7344 100644
--- a/noncore/settings/networksettings2/opietooth2/OTSDPService.h
+++ b/noncore/settings/networksettings2/opietooth2/OTSDPService.h
@@ -69,7 +69,7 @@ private:
 
     QArray<AttributeEntry> attributeList;
 };
 
-}
+};
 
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTUUID.h b/noncore/settings/networksettings2/opietooth2/OTUUID.h
index aebd9b9..97df114 100644
--- a/noncore/settings/networksettings2/opietooth2/OTUUID.h
+++ b/noncore/settings/networksettings2/opietooth2/OTUUID.h
@@ -53,6 +53,6 @@ public :
 
     uint64_t hi;
     uint64_t lo;
 };
-}
+};
 #endif
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index f8824e0..0a46642 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -70,9 +70,21 @@ State_t USBRun::detectState( void ) {
 
     return Unavailable;
 }
 
-QString USBRun::setMyState( NodeCollection *, Action_t , bool ) {
+QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
+
+    // nothing needs to be done to 'activate' or 'deactivate' 
+    // a cable
+
+    // perhaps (later) we can figure out if the device is IN the
+    // cradle 
+    if( A == Activate ) {
+      NC->setCurrentState( Available );
+    } else if ( A == Deactivate ) {
+      NC->setCurrentState( Unavailable );
+    }
+
     return QString();
 }
 
 // get interface that is free or assigned to us