3 files changed, 51 insertions, 19 deletions

diff --git a/noncore/tools/remote/lirchandler.cpp b/noncore/tools/remote/lirchandler.cpp
index 263b740..ec1e275 100644
--- a/noncore/tools/remote/lirchandler.cpp
+++ b/noncore/tools/remote/lirchandler.cpp
@@ -20,5 +20,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/un.h>
 #include <unistd.h>
 #include <errno.h>
@@ -28,4 +27,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <qobject.h>
 #include <opie2/oprocess.h>
+#include <qpe/qcopenvelope_qws.h>
 
 #include "lirchandler.h"
@@ -269,2 +269,25 @@ bool LircHandler::isLircdRunning(void)
         return (OProcess::processPID("lircd") != 0);
 }
+
+bool LircHandler::setupModules(void)
+{
+        // Remove IrDA modules which get in the way
+        system("rmmod ircomm-tty ircomm");
+        // Load LIRC device driver
+        system("modprobe lirc_sir");
+        return true;
+}
+
+bool LircHandler::cleanupModules(void)
+{
+        // Unload LIRC device driver
+        system("rmmod lirc_sir");
+        // Load IrDA drivers back in
+        system("modprobe ircomm-tty");
+        return true;
+}
+
+void LircHandler::disableIrDA(void)
+{
+        QCopEnvelope e("QPE/IrDaApplet", "disableIrda()");
+}
diff --git a/noncore/tools/remote/lirchandler.h b/noncore/tools/remote/lirchandler.h
index c7665cb..4e56b6b 100644
--- a/noncore/tools/remote/lirchandler.h
+++ b/noncore/tools/remote/lirchandler.h
@@ -18,4 +18,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #define LIRCHANDLER_H
 
+#include <sys/un.h>
+
 class LircHandler
 {
@@ -34,4 +36,7 @@ public:
         bool stopLircd(void);
         bool isLircdRunning(void);
+        bool setupModules(void);
+        bool cleanupModules(void);
+        void disableIrDA(void);
 };
 
diff --git a/noncore/tools/remote/remote.cpp b/noncore/tools/remote/remote.cpp
index 67fc57d..5b756cb 100644
--- a/noncore/tools/remote/remote.cpp
+++ b/noncore/tools/remote/remote.cpp
@@ -40,21 +40,25 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 int main( int argc, char **argv )
 {
-    QPEApplication a( argc, argv );
-    MainView w;
-    a.setMainWidget( &w );
-    QPEApplication::showWidget( &w );
-    
-                LircHandler lh;
-                if(!lh.isLircdRunning()) {
-                        QMessageBox mb("Error!",
-                                                                                        "Lircd is not running",
-                                                                                        QMessageBox::NoIcon,
-                                                                                        QMessageBox::Ok,
-                                                                                        QMessageBox::NoButton,
-                                                                                        QMessageBox::NoButton);
-                        mb.exec();
-                        
-                }
-                                
-                return a.exec();
+        QPEApplication a( argc, argv );
+        
+        LircHandler lh;
+        
+        lh.disableIrDA();
+        lh.setupModules();
+        lh.startLircd();
+        if(!lh.isLircdRunning()) {
+                QMessageBox::critical(NULL, QObject::tr("Error"),
+                                QObject::tr("Unable to start lircd"),
+                                QMessageBox::Ok, QMessageBox::NoButton);
+        }
+        
+        MainView w;
+        a.setMainWidget( &w );
+        QPEApplication::showWidget( &w );
+        int result = a.exec();
+        
+        lh.stopLircd();
+        lh.cleanupModules();
+        
+        return result;
 }