also activate discovery if not allready running - makes beaming with s45 easier

2 files changed, 21 insertions, 10 deletions

diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a5b4bfc..51c2ebf 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -59,3 +59,4 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
 	m_popup = 0;
-        m_wasOn = false;
+                m_wasOn = false;
+                m_wasDiscover = false;
 
@@ -290,4 +291,4 @@ void IrdaApplet::timerEvent ( QTimerEvent * )
 {
-	bool oldactive     = m_irda_active;
-	bool olddiscovery  = m_irda_discovery_active;
+	bool oldactive = m_irda_active;
+	bool olddiscovery = m_irda_discovery_active;
 	bool receiveUpdate = false;
@@ -299,3 +300,3 @@ void IrdaApplet::timerEvent ( QTimerEvent * )
 
-	m_irda_active           = checkIrdaStatus ( );
+	m_irda_active = checkIrdaStatus ( );
 	m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
@@ -316,3 +317,3 @@ void IrdaApplet::paintEvent ( QPaintEvent * )
 	if ( m_irda_discovery_active )
-		p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
+                                p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
 
@@ -331,8 +332,17 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
         m_wasOn = checkIrdaStatus();
-        if (!m_wasOn)
+        m_wasDiscover = checkIrdaDiscoveryStatus();
+        if (!m_wasOn)  {
             setIrdaStatus( true );
-    }else if ( str == "disableIrda()") {
-        if (!m_wasOn)
+        }
+        if ( !m_wasDiscover ) {
+            setIrdaDiscoveryStatus ( true );
+        }
+    } else if ( str == "disableIrda()") {
+        if (!m_wasOn)  {
             setIrdaStatus( false );
-    }else if ( str == "listDevices()") {
+        }
+        if ( !m_wasDiscover ) {
+            setIrdaDiscoveryStatus ( false );
+        }
+    } else if ( str == "listDevices()") {
         QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 675f874..ec1d32c 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -70,3 +70,4 @@ private:
 
-        bool m_wasOn; // if IrDa was enabled
+                bool m_wasOn; // if IrDa was enabled
+	bool m_wasDiscover;
 };