8 files changed, 25 insertions, 30 deletions
diff --git a/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control b/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control
index b346c5d..08f131f 100644
--- a/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control
+++ b/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control
@@ -1,7 +1,7 @@
-Package: opie-networksettingsplugin2-vpn
+Package: opie-networksettings2plugin-vpn
 Files: plugins/networksettings2/libvpn.so*
 Priority: optional
 Section: opie/settings
 Maintainer: Wim Delvaux <wimpie@handhelds.org>
 Architecture: arm
 Depends: opie-networksettings2, libopiecore2, libopienet2
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index 9d3b6e7..23ec04a 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -2,12 +2,16 @@
 #include "vpn_NNI.h"
 
 static const char * VPNNeeds[] = 
     { 0
     };
 
+static const char * VPNProvides[] = 
+    { "connection",
+      0
+    };
 /**
  * Constructor, find all of the possible interfaces
  */
 VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) {
 }
 
@@ -30,14 +34,14 @@ ANetNodeInstance * VPNNetNode::createInstance( void ) {
 }
 
 const char ** VPNNetNode::needs( void ) {
       return VPNNeeds;
 }
 
-const char * VPNNetNode::provides( void ) {
-      return "connection";
+const char ** VPNNetNode::provides( void ) {
+      return VPNProvides;
 }
 
 void VPNNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void VPNNetNode::saveSpecificAttribute( QTextStream & ) {
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h
index 3c7b5e0..c2e43d4 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.h
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.h
@@ -17,13 +17,13 @@ public:
     virtual const QString pixmapName() 
       { return "Devices/vpn"; }
 
     virtual const QString nodeDescription() ;
     virtual ANetNodeInstance * createInstance( void );
     virtual const char ** needs( void );
-    virtual const char * provides( void );
+    virtual const char ** provides( void );
 
 private:
 
       virtual void setSpecificAttribute( QString & Attr, QString & Value );
       virtual void saveSpecificAttribute( QTextStream & TS );
 };
diff --git a/noncore/settings/networksettings2/vpn/vpndata.h b/noncore/settings/networksettings2/vpn/vpndata.h
index 5c986aa..ee88bc4 100644
--- a/noncore/settings/networksettings2/vpn/vpndata.h
+++ b/noncore/settings/networksettings2/vpn/vpndata.h
@@ -1,16 +1,17 @@
 #ifndef VPN_DATA_H
 #define VPN_DATA_H
 
 #include <qstring.h>
-typedef struct VPNData {
+class VPNData {
+public :
       QString Device;
       QString LockFile;
       long Speed;
       short Parity;
       short DataBits;
       short StopBits;
       bool HardwareControl;
       bool SoftwareControl;
-} VPNData_t; 
+} ; 
 
 #endif
diff --git a/noncore/settings/networksettings2/vpn/vpnedit.cpp b/noncore/settings/networksettings2/vpn/vpnedit.cpp
index f336394..8445757 100644
--- a/noncore/settings/networksettings2/vpn/vpnedit.cpp
+++ b/noncore/settings/networksettings2/vpn/vpnedit.cpp
@@ -7,12 +7,12 @@ VPNEdit::VPNEdit( QWidget * Parent ) : VPNGUI( Parent ){
 }
 
 QString VPNEdit::acceptable( void ) {
     return QString();
 }
 
-void VPNEdit::showData( VPNData_t & Data ) {
+void VPNEdit::showData( VPNData & Data ) {
 }
 
-bool VPNEdit::commit( VPNData_t & Data ) {
+bool VPNEdit::commit( VPNData & Data ) {
     return 0;
 }
diff --git a/noncore/settings/networksettings2/vpn/vpnedit.h b/noncore/settings/networksettings2/vpn/vpnedit.h
index 76480cd..156bcc5 100644
--- a/noncore/settings/networksettings2/vpn/vpnedit.h
+++ b/noncore/settings/networksettings2/vpn/vpnedit.h
@@ -4,9 +4,9 @@
 class VPNEdit  : public VPNGUI {
 
 public :
 
     VPNEdit( QWidget * parent );
     QString acceptable( void );
-    bool commit( VPNData_t & Data );
-    void showData( VPNData_t & Data );
+    bool commit( VPNData & Data );
+    void showData( VPNData & Data );
 };
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.cpp b/noncore/settings/networksettings2/vpn/vpnrun.cpp
index ab2966c..64728aa 100644
--- a/noncore/settings/networksettings2/vpn/vpnrun.cpp
+++ b/noncore/settings/networksettings2/vpn/vpnrun.cpp
@@ -1,6 +1 @@
 #include "vpnrun.h"
-
-bool VPNRun::handlesInterface( const QString & ) {
-    // to be figured out
-    return 0;
-}
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.h b/noncore/settings/networksettings2/vpn/vpnrun.h
index c19b609..9a55625 100644
--- a/noncore/settings/networksettings2/vpn/vpnrun.h
+++ b/noncore/settings/networksettings2/vpn/vpnrun.h
@@ -1,32 +1,27 @@
 #ifndef VPNRUN_H
 #define VPNRUN_H
 
-#include <asconnection.h>
+#include <netnode.h>
 #include "vpndata.h"
 
-class VPNRun  : public AsConnection {
+class VPNRun  : public RuntimeInfo {
 
 public :
 
       VPNRun( ANetNodeInstance * NNI, VPNData & Data ) : 
-              AsConnection( NNI )
+              RuntimeInfo( NNI )
         { }
 
-      virtual AsConnection * asConnection( void ) 
-        { return (AsConnection *)this; }
-protected :
-
-      void detectState( NodeCollection * )
-        { }
+      virtual RuntimeInfo * connection( void ) 
+        { return this; }
 
-      bool setState( NodeCollection *, Action_t, bool )
-        { return 0; }
+      State_t detectState( void )
+        { return Unknown; }
 
-      bool canSetState( State_t, Action_t )
-        { return 0; }
-
-      bool handlesInterface( const QString & I );
+protected :
 
+      QString setMyState( NodeCollection * , Action_t, bool )
+        { return QString(); }
 };
 
 #endif