3 files changed, 17 insertions, 2 deletions

diff --git a/noncore/settings/networksettings2/usb/usb.pro b/noncore/settings/networksettings2/usb/usb.pro
index 37c1bde..d9890b6 100644
--- a/noncore/settings/networksettings2/usb/usb.pro
+++ b/noncore/settings/networksettings2/usb/usb.pro
@@ -1,8 +1,8 @@
 TEMPLATE        = lib
-CONFIG          += qt warn_on release
+CONFIG          += qt warn_on release plugin
 DESTDIR         = $(OPIEDIR)/plugins/networksettings2
 HEADERS		= usb_NN.h \
                   usb_NNI.h \
                   usbedit.h
 SOURCES		= usb_NN.cpp \
                   usb_NNI.cpp \
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index bd9ae2b..9c07b82 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -1,10 +1,16 @@
 #include <resources.h>
 #include "usb_NN.h"
 #include "usb_NNI.h"
 
+#ifndef MYPLUGIN
+
+#include "netnodeinterface.h"
+
+#endif
+
 static const char * USBNeeds[] = 
     { 0
     };
 
 static const char * USBProvides[] = 
     { "device",
@@ -52,11 +58,20 @@ QString USBNetNode::genNic( long ) {
 void USBNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void USBNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
+#ifdef MYPLUGIN 
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new USBNetNode() );
 }
+
+#else
+
+OPIE_NS2_PLUGIN( NetNodeInterface<USBNetNode> )
+
+#endif
+
 }
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.cpp b/noncore/settings/networksettings2/usb/usb_NNI.cpp
index 600b771..424845c 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp
@@ -42,13 +42,13 @@ short AUSB::generateFileEmbedded( SystemFile & SF,
 
     if( SF.name() == "interfaces" ) {
       Log(("Generate USB for %s\n", SF.name().latin1() ));
       // generate mapping stanza for this interface
       SF << "  pre-up " 
          << QPEApplication::qpeDir() 
-         << "bin/setmacaddress.sh " 
+         << "bin/NS2SetMac.sh " 
          << NIC 
          << " || true" 
          << endl;
       rvl = 0;
     }
     rvd = ANetNodeInstance::generateFileEmbedded(SF, DevNr );