7 files changed, 27 insertions, 24 deletions

diff --git a/noncore/settings/networksettings2/modem/modem_NN.cpp b/noncore/settings/networksettings2/modem/modem_NN.cpp
index ee61b10..06f417c 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.cpp
+++ b/noncore/settings/networksettings2/modem/modem_NN.cpp
@@ -2,7 +2,12 @@
 #include "modem_NNI.h"
 
 static const char * ModemNeeds[] = 
-    { "line"
+    { "line",
+      0
+    };
+static const char * ModemProvides[] = 
+    { "modem",
+      0
     };
 
 /**
@@ -33,8 +38,8 @@ const char ** ModemNetNode::needs( void ) {
       return ModemNeeds;
 }
 
-const char * ModemNetNode::provides( void ) {
-      return "line";
+const char ** ModemNetNode::provides( void ) {
+      return ModemProvides;
 }
 
 void ModemNetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/modem/modem_NN.h b/noncore/settings/networksettings2/modem/modem_NN.h
index a76525f..5b3b573 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.h
+++ b/noncore/settings/networksettings2/modem/modem_NN.h
@@ -20,7 +20,7 @@ public:
     virtual const QString nodeDescription() ;
     virtual ANetNodeInstance * createInstance( void );
     virtual const char ** needs( void );
-    virtual const char * provides( void );
+    virtual const char ** provides( void );
 
 private:
 
diff --git a/noncore/settings/networksettings2/modem/modemdata.h b/noncore/settings/networksettings2/modem/modemdata.h
index 773cb77..89656ed 100644
--- a/noncore/settings/networksettings2/modem/modemdata.h
+++ b/noncore/settings/networksettings2/modem/modemdata.h
@@ -2,7 +2,8 @@
 #define MODEM_DATA_H
 
 #include <qstring.h>
-typedef struct ModemData {
+class ModemData {
+public :
       QString Device;
       QString LockFile;
       long Speed;
@@ -12,6 +13,6 @@ typedef struct ModemData {
       bool HardwareControl;
       bool SoftwareControl;
 
-} ModemData_t; 
+} ; 
 
 #endif
diff --git a/noncore/settings/networksettings2/modem/modemedit.cpp b/noncore/settings/networksettings2/modem/modemedit.cpp
index fd3d694..d97d895 100644
--- a/noncore/settings/networksettings2/modem/modemedit.cpp
+++ b/noncore/settings/networksettings2/modem/modemedit.cpp
@@ -9,10 +9,10 @@ QString ModemEdit::acceptable( void ) {
     return QString();
 }
 
-bool ModemEdit::commit( ModemData_t & Data ) {
+bool ModemEdit::commit( ModemData & Data ) {
     return 0;
 }
 
-void ModemEdit::showData( ModemData_t & Data ) {
+void ModemEdit::showData( ModemData & Data ) {
 }
 
diff --git a/noncore/settings/networksettings2/modem/modemedit.h b/noncore/settings/networksettings2/modem/modemedit.h
index 56e2a82..ed9cfc0 100644
--- a/noncore/settings/networksettings2/modem/modemedit.h
+++ b/noncore/settings/networksettings2/modem/modemedit.h
@@ -7,6 +7,6 @@ public :
 
     ModemEdit( QWidget * parent );
     QString acceptable( void );
-    bool commit( ModemData_t & Data );
-    void showData( ModemData_t & Data );
+    bool commit( ModemData & Data );
+    void showData( ModemData & Data );
 };
diff --git a/noncore/settings/networksettings2/modem/modemrun.h b/noncore/settings/networksettings2/modem/modemrun.h
index 491a677..eb3a193 100644
--- a/noncore/settings/networksettings2/modem/modemrun.h
+++ b/noncore/settings/networksettings2/modem/modemrun.h
@@ -1,28 +1,25 @@
-#include <asline.h>
+#include <netnode.h>
 #include "modemdata.h"
 
-class ModemRun  : public AsLine {
+class ModemRun  : public RuntimeInfo {
 
 public :
 
       ModemRun( ANetNodeInstance * NNI, 
-                ModemData & Data ) : AsLine ( NNI )
+                ModemData & Data ) : RuntimeInfo ( NNI )
         { }
 
-      virtual AsLine * asLine( void ) 
-        { return (AsLine *)this; }
+      virtual RuntimeInfo * line( void ) 
+        { return this; }
 
       virtual QString deviceFile( void )
         { return QString("/dev/modem"); }
 
-protected :
-
-      void detectState( NodeCollection * )
-        { }
+      State_t detectState( void )
+        { return Unknown;}
 
-      bool setState( NodeCollection *, Action_t, bool )
-        { return 0; }
+protected :
 
-      bool canSetState( State_t, Action_t )
-        { return 0; }
+      QString setMyState( NodeCollection * , Action_t, bool )
+        { return QString(); }
 };
diff --git a/noncore/settings/networksettings2/modem/opie-networksettings2plugin-modem.control b/noncore/settings/networksettings2/modem/opie-networksettings2plugin-modem.control
index eaa6ab0..a73249a 100644
--- a/noncore/settings/networksettings2/modem/opie-networksettings2plugin-modem.control
+++ b/noncore/settings/networksettings2/modem/opie-networksettings2plugin-modem.control
@@ -1,4 +1,4 @@
-Package: opie-networksettingsplugin2-modem
+Package: opie-networksettings2plugin-modem
 Files: plugins/networksettings2/libmodem.so*
 Priority: optional
 Section: opie/settings